summaryrefslogtreecommitdiffstats
path: root/sys/fs/nullfs
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2006-02-10 18:06:49 +0000
committerjhb <jhb@FreeBSD.org>2006-02-10 18:06:49 +0000
commit6acd384eb796eacb4f9f16e262f08a0dcc701a47 (patch)
tree4bd3e1fd791ea3e3e6eb39db64b17fda9e770992 /sys/fs/nullfs
parent6f93f5275eb1ab97042df92082f4645e71c907a0 (diff)
downloadFreeBSD-src-6acd384eb796eacb4f9f16e262f08a0dcc701a47.zip
FreeBSD-src-6acd384eb796eacb4f9f16e262f08a0dcc701a47.tar.gz
Correctly set MNTK_MPSAFE flag from the lower vnode's mount rather than
always turning it on along with any flags set in the lower mount. Tested by: kris Reviewed by: jeff MFC after: 3 days
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r--sys/fs/nullfs/null_vfsops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 348160c..1ba5c6e 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -177,7 +177,7 @@ nullfs_mount(struct mount *mp, struct thread *td)
if (NULLVPTOLOWERVP(nullm_rootvp)->v_mount->mnt_flag & MNT_LOCAL)
mp->mnt_flag |= MNT_LOCAL;
- mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag | MNTK_MPSAFE;
+ mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE;
mp->mnt_data = (qaddr_t) xmp;
vfs_getnewfsid(mp);
OpenPOWER on IntegriCloud