From: Jeff Layton <jlayton@redhat.com>
Date: Sun, 18 Mar 2018 12:37:01 +0000 (-0400)
Subject: nfs4: always reset notified flag to false before repolling for lock
X-Git-Tag: v4.17-rc1~34^2~31
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=41a74620185e2c7666c0fc4bfd7ff2f21fd0cb13;p=linux-block.git

nfs4: always reset notified flag to false before repolling for lock

We may get a notification and lose the race to another client. Ensure
that we wait again for a notification in that case.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 47f3c273245e..5ab28454f117 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6673,6 +6673,7 @@ nfs4_retry_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
 	add_wait_queue(q, &wait);
 
 	while(!signalled()) {
+		waiter.notified = false;
 		status = nfs4_proc_setlk(state, cmd, request);
 		if ((status != -EAGAIN) || IS_SETLK(cmd))
 			break;