- LK_NOPAUSE is a nop now.

Sponsored by:   Isilon Systems, Inc.

4 files changed, 7 insertions, 7 deletions

diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index b172f1e..34d83ee 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1910,7 +1910,7 @@ retry_lookup:
 			 * Get the page from backing store.
 			 */
 			bsize = vp->v_mount->mnt_stat.f_iosize;
-			vn_lock(vp, LK_SHARED | LK_NOPAUSE | LK_RETRY, td);
+			vn_lock(vp, LK_SHARED | LK_RETRY, td);
 			/*
 			 * XXXMAC: Because we don't have fp->f_cred here,
 			 * we pass in NOCRED.  This is probably wrong, but
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 0f59019..bceadef 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -411,7 +411,7 @@ vfs_mount_alloc(struct vnode *vp, struct vfsconf *vfsp,
 	TAILQ_INIT(&mp->mnt_nvnodelist);
 	mp->mnt_nvnodelistsize = 0;
 	mtx_init(&mp->mnt_mtx, "struct mount mtx", NULL, MTX_DEF);
-	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, LK_NOPAUSE);
+	lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, 0);
 	vfs_busy(mp, LK_NOWAIT, 0, td);
 	mp->mnt_op = vfsp->vfc_vfsops;
 	mp->mnt_vfc = vfsp;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index d3e5ee3..09fc95f 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -352,7 +352,7 @@ vfs_busy(mp, flags, interlkp, td)
 	}
 	if (interlkp)
 		mtx_unlock(interlkp);
-	lkflags = LK_SHARED | LK_NOPAUSE | LK_INTERLOCK;
+	lkflags = LK_SHARED | LK_INTERLOCK;
 	if (lockmgr(&mp->mnt_lock, lkflags, MNT_MTX(mp), td))
 		panic("vfs_busy: unexpected lock failure");
 	return (0);
@@ -831,7 +831,7 @@ getnewvnode(tag, mp, vops, vpp)
 	 */
 	vp->v_vnlock = &vp->v_lock;
 	mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF);
-	lockinit(vp->v_vnlock, PVFS, tag, VLKTIMEOUT, LK_NOPAUSE);
+	lockinit(vp->v_vnlock, PVFS, tag, VLKTIMEOUT, 0);
 	/*
 	 * Initialize bufobj.
 	 */
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 0723a63..afdeccf 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -496,10 +496,10 @@ vn_read(fp, uio, active_cred, flags, td)
 	 * Once this field has it's own lock we can acquire this shared.
 	 */
 	if ((flags & FOF_OFFSET) == 0) {
-		vn_lock(vp, LK_EXCLUSIVE | LK_NOPAUSE | LK_RETRY, td);
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 		uio->uio_offset = fp->f_offset;
 	} else
-		vn_lock(vp, LK_SHARED | LK_NOPAUSE | LK_RETRY, td);
+		vn_lock(vp, LK_SHARED | LK_RETRY, td);
 
 	ioflag |= sequential_heuristic(uio, fp);
 
@@ -811,7 +811,7 @@ debug_vn_lock(vp, flags, td, filename, line)
 		 * lockmgr drops interlock before it will return for
 		 * any reason.  So force the code above to relock it.
 		 */
-		error = VOP_LOCK(vp, flags | LK_NOPAUSE | LK_INTERLOCK, td);
+		error = VOP_LOCK(vp, flags | LK_INTERLOCK, td);
 		flags &= ~LK_INTERLOCK;
 		/*
 		 * Callers specify LK_RETRY if they wish to get dead vnodes.