NFSv2/v3 locking: Patch by Patrice Dumas that adds a check to ensure we really

    were requesting a blocking lock when we get a reply from the server asking us to
    block.

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index a5c032de30cd2d70c88fa07db21c5bcc1b8678f6..8a3e7d694992630ee3b93f880f4b45666af7aaf7 100644 (file)
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -443,7 +443,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
                }
                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;