clntproc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -u --recursive --new-file --show-c-function linux-2.6.3-11-lockd1/fs/lockd/clntproc.c linux-2.6.3-12-lockd2/fs/lockd/clntproc.c
--- linux-2.6.3-11-lockd1/fs/lockd/clntproc.c	2004-02-19 11:47:44.000000000 -0800
+++ linux-2.6.3-12-lockd2/fs/lockd/clntproc.c	2004-02-19 21:25:03.000000000 -0800
@@ -456,7 +456,7 @@ nlmclnt_lock(struct nlm_rqst *req, struc
 		}
 		if (status < 0)
 			return status;
-	} while (resp->status == NLM_LCK_BLOCKED);
+	} while (resp->status == NLM_LCK_BLOCKED && req->a_args.block);
 
 	if (resp->status == NLM_LCK_GRANTED) {
 		fl->fl_u.nfs_fl.state = host->h_state;