Page MenuHomeFreeBSD
Files F144483602

D40852.diff
No OneTemporary
Actions

D40852.diff
View Options

diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -212,12 +212,6 @@
&xmp->notify_node);
}
- if (lowerrootvp == mp->mnt_vnodecovered) {
- vn_lock(lowerrootvp, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE);
- lowerrootvp->v_vflag |= VV_CROSSLOCK;
- VOP_UNLOCK(lowerrootvp);
- }
-
MNT_ILOCK(mp);
if ((xmp->nullm_flags & NULLM_CACHE) != 0) {
mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag &
@@ -276,11 +270,6 @@
vfs_unregister_for_notification(mntdata->nullm_vfs,
&mntdata->notify_node);
}
- if (mntdata->nullm_lowerrootvp == mp->mnt_vnodecovered) {
- vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE);
- mp->mnt_vnodecovered->v_vflag &= ~VV_CROSSLOCK;
- VOP_UNLOCK(mp->mnt_vnodecovered);
- }
vfs_unregister_upper(mntdata->nullm_vfs, &mntdata->upper_node);
vrele(mntdata->nullm_lowerrootvp);
mp->mnt_data = NULL;
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -324,30 +324,6 @@
return (ENOENT);
}
- /*
- * Specify that the covered vnode lock should remain held while
- * lookup() performs the cross-mount walk. This prevents a lock-order
- * reversal between the covered vnode lock (which is also locked by
- * unionfs_lock()) and the mountpoint's busy count. Without this,
- * unmount will lock the covered vnode lock (directly through the
- * covered vnode) and wait for the busy count to drain, while a
- * concurrent lookup will increment the busy count and then lock
- * the covered vnode lock (indirectly through unionfs_lock()).
- *
- * Note that we can't yet use this facility for the 'below' case
- * in which the upper vnode is the covered vnode, because that would
- * introduce a different LOR in which the cross-mount lookup would
- * effectively hold the upper vnode lock before acquiring the lower
- * vnode lock, while an unrelated lock operation would still acquire
- * the lower vnode lock before the upper vnode lock, which is the
- * order unionfs currently requires.
- */
- if (!below) {
- vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE);
- mp->mnt_vnodecovered->v_vflag |= VV_CROSSLOCK;
- VOP_UNLOCK(mp->mnt_vnodecovered);
- }
-
MNT_ILOCK(mp);
if ((lowermp->mnt_flag & MNT_LOCAL) != 0 &&
(uppermp->mnt_flag & MNT_LOCAL) != 0)
@@ -400,9 +376,6 @@
if (error)
return (error);
- vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE);
- mp->mnt_vnodecovered->v_vflag &= ~VV_CROSSLOCK;
- VOP_UNLOCK(mp->mnt_vnodecovered);
vfs_unregister_upper(ump->um_lowervp->v_mount, &ump->um_lower_link);
vfs_unregister_upper(ump->um_uppervp->v_mount, &ump->um_upper_link);
free(ump, M_UNIONFSMNT);
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -272,7 +272,6 @@
#define VV_FORCEINSMQ 0x1000 /* force the insmntque to succeed */
#define VV_UNUSED01 0x2000 /* was: fdescfs linux vnode */
#define VV_UNREF 0x4000 /* vunref, do not drop lock in inactive() */
-#define VV_CROSSLOCK 0x8000 /* vnode lock is shared w/ root mounted here */
#define VMP_LAZYLIST 0x0001 /* Vnode is on mnt's lazy list */

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 5:22 PM (19 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28598236
Default Alt Text
D40852.diff (3 KB)

Event Timeline