d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: prefix lookup and relookup with vfs_

Browse Source 
Reviewed by:	imp, mckusick
Differential Revision:		https://reviews.freebsd.org/D34530
This commit is contained in:
Mateusz Guzik 2022-03-13 14:44:39 +00:00
parent 02fc4e319c
commit 0134bbe56f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/fs/ext2fs/ext2_vnops.c
View File

@ -919,7 +919,7 @@ ext2_rename(struct vop_rename_args *ap)
if (error)
goto out;
VREF(tdvp);
error = relookup(tdvp, &tvp, tcnp);
error = vfs_relookup(tdvp, &tvp, tcnp);
if (error)
goto out;
vrele(tdvp);
@ -1045,7 +1045,7 @@ ext2_rename(struct vop_rename_args *ap)
fcnp->cn_flags &= ~MODMASK;
fcnp->cn_flags |= LOCKPARENT | LOCKLEAF;
VREF(fdvp);
error = relookup(fdvp, &fvp, fcnp);
error = vfs_relookup(fdvp, &fvp, fcnp);
if (error == 0)
vrele(fdvp);
if (fvp != NULL) {

2
sys/fs/nfsserver/nfs_nfsdport.c
View File

@ -677,7 +677,7 @@ nfsvno_namei(struct nfsrv_descript *nd, struct nameidata *ndp,
* In either case ni_startdir will be dereferenced and NULLed
* out.
*/
error = lookup(ndp);
error = vfs_lookup(ndp);
if (error)
break;

4
sys/fs/unionfs/union_subr.c
View File

@ -681,7 +681,7 @@ unionfs_relookup(struct vnode *dvp, struct vnode **vpp,
vref(dvp);
VOP_UNLOCK(dvp);
if ((error = relookup(dvp, vpp, cn))) {
if ((error = vfs_relookup(dvp, vpp, cn))) {
vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
} else
vrele(dvp);
@ -1028,7 +1028,7 @@ unionfs_vn_create_on_upper(struct vnode **vpp, struct vnode *udvp,
NDPREINIT(&nd);
vref(udvp);
if ((error = relookup(udvp, &vp, &nd.ni_cnd)) != 0)
if ((error = vfs_relookup(udvp, &vp, &nd.ni_cnd)) != 0)
goto unionfs_vn_create_on_upper_free_out2;
vrele(udvp);

6
sys/kern/vfs_lookup.c
View File

@ -655,7 +655,7 @@ namei(struct nameidata *ndp)
*/
for (;;) {
ndp->ni_startdir = dp;
error = lookup(ndp);
error = vfs_lookup(ndp);
if (error != 0)
goto out;
@ -843,7 +843,7 @@ _Static_assert(MAXNAMLEN == NAME_MAX,
* if WANTPARENT set, return unlocked parent in ni_dvp
*/
int
lookup(struct nameidata *ndp)
vfs_lookup(struct nameidata *ndp)
{
char *cp; /* pointer into pathname argument */
char *prev_ni_next; /* saved ndp->ni_next */
@ -1388,7 +1388,7 @@ lookup(struct nameidata *ndp)
* Used by lookup to re-acquire things.
*/
int
relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
{
struct vnode *dp = NULL; /* the directory we are searching */
int rdonly; /* lookup read-only flag bit */

4
sys/sys/namei.h
View File

@ -305,8 +305,8 @@ void NDVALIDATE(struct nameidata *);
#endif
int namei(struct nameidata *ndp);
int lookup(struct nameidata *ndp);
int relookup(struct vnode *dvp, struct vnode **vpp,
int vfs_lookup(struct nameidata *ndp);
int vfs_relookup(struct vnode *dvp, struct vnode **vpp,
struct componentname *cnp);
#endif