summaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_vnops.c
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2010-04-12 16:37:39 +0000
committerBob Beck <beck@cvs.openbsd.org>2010-04-12 16:37:39 +0000
commitb21be0a881207d66328a4b1fb9e42175809eae01 (patch)
treeb9671664237cf20154efede68a325609cf51ebde /sys/nfs/nfs_vnops.c
parentb468cb40bfbf32b9fe0a861f825aafe2ae4a74cd (diff)
Don't jump the queue if we have to wait on the client side because
the nfs_bufq is full - instead tsleep waiting for one of our nfsiod's to free up space for us in the queue so we can enqueue on the end. ok blambert@, tedu@, oga@
Diffstat (limited to 'sys/nfs/nfs_vnops.c')
-rw-r--r--sys/nfs/nfs_vnops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 5f0fbf3d0b6..20e38f543bb 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_vnops.c,v 1.128 2010/03/29 23:33:39 krw Exp $ */
+/* $OpenBSD: nfs_vnops.c,v 1.129 2010/04/12 16:37:38 beck Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */
/*
@@ -2715,7 +2715,7 @@ nfs_strategy(void *v)
* queue the request, wake it up and wait for completion
* otherwise just do it ourselves.
*/
- if ((bp->b_flags & B_ASYNC) == 0 || nfs_asyncio(bp))
+ if ((bp->b_flags & B_ASYNC) == 0 || nfs_asyncio(bp, 0))
error = nfs_doio(bp, p);
return (error);
}