[Midnightbsd-cvs] src [7934] trunk/sys/fs/nfsclient: enable deadlock avoidance code for NFS client

[laffer1 at midnightbsd.org]

Revision: 7934
          http://svnweb.midnightbsd.org/src/?rev=7934
Author:   laffer1
Date:     2016-09-14 17:13:14 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
enable deadlock avoidance code for NFS client

Modified Paths:
--------------
    trunk/sys/fs/nfsclient/nfs_clbio.c
    trunk/sys/fs/nfsclient/nfs_clvfsops.c

Modified: trunk/sys/fs/nfsclient/nfs_clbio.c
===================================================================
--- trunk/sys/fs/nfsclient/nfs_clbio.c	2016-09-14 21:12:41 UTC (rev 7933)
+++ trunk/sys/fs/nfsclient/nfs_clbio.c	2016-09-14 21:13:14 UTC (rev 7934)
@@ -698,7 +698,7 @@
 	    };
 
 	    if (n > 0) {
-		    error = uiomove(bp->b_data + on, (int)n, uio);
+		    error = vn_io_fault_uiomove(bp->b_data + on, (int)n, uio);
 	    }
 	    if (vp->v_type == VLNK)
 		n = 0;
@@ -1179,7 +1179,7 @@
 		}
 
 		local_resid = uio->uio_resid;
-		error = uiomove((char *)bp->b_data + on, n, uio);
+		error = vn_io_fault_uiomove((char *)bp->b_data + on, n, uio);
 
 		if (error != 0 && !bp_cached) {
 			/*

Modified: trunk/sys/fs/nfsclient/nfs_clvfsops.c
===================================================================
--- trunk/sys/fs/nfsclient/nfs_clvfsops.c	2016-09-14 21:12:41 UTC (rev 7933)
+++ trunk/sys/fs/nfsclient/nfs_clvfsops.c	2016-09-14 21:13:14 UTC (rev 7934)
@@ -1136,7 +1136,8 @@
 out:
 	if (!error) {
 		MNT_ILOCK(mp);
-		mp->mnt_kern_flag |= (MNTK_MPSAFE|MNTK_LOOKUP_SHARED);
+		mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED |
+		    MNTK_NO_IOPF;
 		MNT_IUNLOCK(mp);
 	}
 	return (error);