Author: kib
Date: Thu Jun 21 09:26:06 2012
New Revision: 237367
URL: http://svn.freebsd.org/changeset/base/237367
Log:
Enable deadlock avoidance code for NFS client.
MFC after: 2 weeks
Modified:
head/sys/fs/nfsclient/nfs_clbio.c
head/sys/fs/nfsclient/nfs_clvfsops.c
Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c Thu Jun 21 09:20:07 2012
(r237366)
+++ head/sys/fs/nfsclient/nfs_clbio.c Thu Jun 21 09:26:06 2012
(r237367)
@@ -722,7 +722,7 @@ ncl_bioread(struct vnode *vp, struct uio
};
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;
@@ -1203,7 +1203,7 @@ again:
}
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: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c Thu Jun 21 09:20:07 2012
(r237366)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c Thu Jun 21 09:26:06 2012
(r237367)
@@ -1136,7 +1136,8 @@ nfs_mount(struct mount *mp)
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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
