svn commit: r273852 - head/sys/fs/nfsclient

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Oct 30 09:25:03 2014
New Revision: 273852
URL: https://svnweb.freebsd.org/changeset/base/273852

Log:
  Fix handling of "conn" mount_nfs(8) option.
  
  Reviewed by:	rmacklem@
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/fs/nfsclient/nfs_clvfsops.c

Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c	Thu Oct 30 09:06:52 2014	(r273851)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c	Thu Oct 30 09:25:03 2014	(r273852)
@@ -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)