svn commit: r275252 - stable/10/sys/fs/nfsclient

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Nov 29 15:48:47 2014
New Revision: 275252
URL: https://svnweb.freebsd.org/changeset/base/275252

Log:
  MFC r273852:
  
  Fix handling of "conn" mount_nfs(8) option.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/fs/nfsclient/nfs_clvfsops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clvfsops.c	Sat Nov 29 15:45:19 2014	(r275251)
+++ stable/10/sys/fs/nfsclient/nfs_clvfsops.c	Sat Nov 29 15:48:47 2014	(r275252)
@@ -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)