diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2012-11-09 18:02:25 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2012-11-09 18:02:25 +0000 |
| commit | bc2258da8810c3dfbe850aed85176a6eee260585 (patch) | |
| tree | 85566631342fad6e72bb3ce702047490a06985fb /sys/fs/unionfs | |
| parent | 372c8c7e5d9d9316071ed0690098380b6512e1c5 (diff) | |
Notes
Diffstat (limited to 'sys/fs/unionfs')
| -rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 5 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_vnops.c | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 936df4c2fb969..c6586e222678f 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -266,11 +266,6 @@ unionfs_domount(struct mount *mp) ump->um_copymode = copymode; ump->um_whitemode = whitemode; - MNT_ILOCK(mp); - if ((lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE) && - (upperrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE)) - mp->mnt_kern_flag |= MNTK_MPSAFE; - MNT_IUNLOCK(mp); mp->mnt_data = ump; /* diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 36ca302620926..5076f161e24cf 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1867,8 +1867,7 @@ unionfs_lock(struct vop_lock1_args *ap) if ((revlock = unionfs_get_llt_revlock(vp, flags)) == 0) panic("unknown lock type: 0x%x", flags & LK_TYPE_MASK); - if ((mp->mnt_kern_flag & MNTK_MPSAFE) != 0 && - (vp->v_iflag & VI_OWEINACT) != 0) + if ((vp->v_iflag & VI_OWEINACT) != 0) flags |= LK_NOWAIT; /* |