Page MenuHomeFreeBSD
Files F163330036

D5442.id14265.diff
No OneTemporary
Actions

D5442.id14265.diff
View Options

Index: head/sys/fs/autofs/autofs_vnops.c
===================================================================
--- head/sys/fs/autofs/autofs_vnops.c
+++ head/sys/fs/autofs/autofs_vnops.c
@@ -214,7 +214,7 @@
struct autofs_mount *amp;
struct autofs_node *anp, *child;
struct componentname *cnp;
- int error, lock_flags;
+ int error;
dvp = ap->a_dvp;
vpp = ap->a_vpp;
@@ -257,23 +257,13 @@
return (error);
if (newvp != NULL) {
- error = VOP_LOOKUP(newvp, ap->a_vpp, ap->a_cnp);
-
/*
- * Instead of figuring out whether our vnode should
- * be locked or not given the error and cnp flags,
- * just "copy" the lock status from vnode returned
- * by mounted filesystem's VOP_LOOKUP(). Get rid
- * of that new vnode afterwards.
+ * The target filesystem got automounted.
+ * Let the lookup(9) go around with the same
+ * path component.
*/
- lock_flags = VOP_ISLOCKED(newvp);
- if (lock_flags == 0) {
- VOP_UNLOCK(dvp, 0);
- vrele(newvp);
- } else {
- vput(newvp);
- }
- return (error);
+ vput(newvp);
+ return (ERELOOKUP);
}
}
Index: head/sys/kern/vfs_lookup.c
===================================================================
--- head/sys/kern/vfs_lookup.c
+++ head/sys/kern/vfs_lookup.c
@@ -495,6 +495,7 @@
int rdonly; /* lookup read-only flag bit */
int error = 0;
int dpunlocked = 0; /* dp has already been unlocked */
+ int relookup = 0; /* do not consume the path component */
struct componentname *cnp = &ndp->ni_cnd;
int lkflags_save;
int ni_dvp_unlocked;
@@ -745,6 +746,14 @@
goto unionlookup;
}
+ if (error == ERELOOKUP) {
+ vref(dp);
+ ndp->ni_vp = dp;
+ error = 0;
+ relookup = 1;
+ goto good;
+ }
+
if (error != EJUSTRETURN)
goto bad;
/*
@@ -777,6 +786,8 @@
goto success;
} else
cnp->cn_lkflags = lkflags_save;
+
+good:
#ifdef NAMEI_DIAGNOSTIC
printf("found\n");
#endif
@@ -856,6 +867,14 @@
*/
KASSERT((cnp->cn_flags & ISLASTCN) || *ndp->ni_next == '/',
("lookup: invalid path state."));
+ if (relookup) {
+ relookup = 0;
+ if (ndp->ni_dvp != dp)
+ vput(ndp->ni_dvp);
+ else
+ vrele(ndp->ni_dvp);
+ goto dirloop;
+ }
if (*ndp->ni_next == '/') {
cnp->cn_nameptr = ndp->ni_next;
while (*cnp->cn_nameptr == '/') {
Index: head/sys/sys/errno.h
===================================================================
--- head/sys/sys/errno.h
+++ head/sys/sys/errno.h
@@ -190,6 +190,7 @@
#define EJUSTRETURN (-2) /* don't modify regs, just return */
#define ENOIOCTL (-3) /* ioctl not handled by this layer */
#define EDIRIOCTL (-4) /* do direct ioctl in GEOM */
+#define ERELOOKUP (-5) /* retry the directory lookup */
#endif
#endif

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 4:23 AM (4 m, 23 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35392020
Default Alt Text
D5442.id14265.diff (2 KB)

Event Timeline