Mercurial > illumos > illumos-gate

changeset 10753:133134d19f73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6887666 mmap() on NFSv4 mounted filesystem can be not interruptible 6887889 Possible not interruptible hang in nfs4_write() with directio, append and intr
author Marcel Telka <Marcel.Telka@Sun.COM>
date Fri, 09 Oct 2009 23:35:39 +0200
parents 75a8eec7b28a
children bc532f9d3ee0
files usr/src/uts/common/fs/nfs/nfs4_vnops.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/nfs/nfs4_vnops.c	Fri Oct 09 12:51:47 2009 -0700
+++ b/usr/src/uts/common/fs/nfs/nfs4_vnops.c	Fri Oct 09 23:35:39 2009 +0200
@@ -2754,7 +2754,7 @@
 		if (nfs_rw_lock_held(&rp->r_rwlock, RW_READER)) {
 			nfs_rw_exit(&rp->r_rwlock);
 			if (nfs_rw_enter_sig(&rp->r_rwlock, RW_WRITER,
-			    INTR(vp)))
+			    INTR4(vp)))
 				return (EINTR);
 		}
 
@@ -10435,7 +10435,7 @@
 	 * r_inmap after we release r_lkserlock.
 	 */
 
-	if (nfs_rw_enter_sig(&rp->r_rwlock, RW_WRITER, INTR(vp)))
+	if (nfs_rw_enter_sig(&rp->r_rwlock, RW_WRITER, INTR4(vp)))
 		return (EINTR);
 	atomic_add_int(&rp->r_inmap, 1);
 	nfs_rw_exit(&rp->r_rwlock);