Page MenuHomeFreeBSD
Files F103063367

D34530.diff
No OneTemporary
Actions

D34530.diff
View Options

diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -919,7 +919,7 @@
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 @@
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) {
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -677,7 +677,7 @@
* In either case ni_startdir will be dereferenced and NULLed
* out.
*/
- error = lookup(ndp);
+ error = vfs_lookup(ndp);
if (error)
break;
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -681,7 +681,7 @@
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 @@
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);
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -655,7 +655,7 @@
*/
for (;;) {
ndp->ni_startdir = dp;
- error = lookup(ndp);
+ error = vfs_lookup(ndp);
if (error != 0)
goto out;
@@ -843,7 +843,7 @@
* 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 @@
* 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 */
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -305,8 +305,8 @@
#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

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 21, 11:05 AM (21 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14760170
Default Alt Text
D34530.diff (2 KB)

Event Timeline