summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2014-11-29 15:48:47 +0000
committertrasz <trasz@FreeBSD.org>2014-11-29 15:48:47 +0000
commit964eff34c65e793e61436608ad903256b2776582 (patch)
treeac56c50858b720fd7d83b1b19fa4bd72150ae3e4 /sys/fs
parent3c827138a2917a7e713bebccd5385c98ce07638d (diff)
downloadFreeBSD-src-964eff34c65e793e61436608ad903256b2776582.zip
FreeBSD-src-964eff34c65e793e61436608ad903256b2776582.tar.gz
MFC r273852:
Fix handling of "conn" mount_nfs(8) option. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/nfsclient/nfs_clvfsops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c
index 469fa1d..462d762 100644
--- a/sys/fs/nfsclient/nfs_clvfsops.c
+++ b/sys/fs/nfsclient/nfs_clvfsops.c
@@ -824,7 +824,7 @@ nfs_mount(struct mount *mp)
if (vfs_getopt(mp->mnt_optnew, "noconn", NULL, NULL) == 0)
args.flags |= NFSMNT_NOCONN;
if (vfs_getopt(mp->mnt_optnew, "conn", NULL, NULL) == 0)
- args.flags |= NFSMNT_NOCONN;
+ args.flags &= ~NFSMNT_NOCONN;
if (vfs_getopt(mp->mnt_optnew, "nolockd", NULL, NULL) == 0)
args.flags |= NFSMNT_NOLOCKD;
if (vfs_getopt(mp->mnt_optnew, "lockd", NULL, NULL) == 0)
OpenPOWER on IntegriCloud