Commit 11f08784 authored by Yihao Wu's avatar Yihao Wu Committed by Greg Kroah-Hartman

NFSv4.1: Fix bug only first CB_NOTIFY_LOCK is handled

commit ba851a39 upstream.

When a waiter is waked by CB_NOTIFY_LOCK, it will retry
nfs4_proc_setlk(). The waiter may fail to nfs4_proc_setlk() and sleep
again. However, the waiter is already removed from clp->cl_lock_waitq
when handling CB_NOTIFY_LOCK in nfs4_wake_lock_waiter(). So any
subsequent CB_NOTIFY_LOCK won't wake this waiter anymore. We should
put the waiter back to clp->cl_lock_waitq before retrying.

Cc: stable@vger.kernel.org #4.9+
Signed-off-by: default avatarYihao Wu <wuyihao@linux.alibaba.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1d8b49a
...@@ -6922,20 +6922,22 @@ nfs4_retry_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) ...@@ -6922,20 +6922,22 @@ nfs4_retry_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
init_wait(&wait); init_wait(&wait);
wait.private = &waiter; wait.private = &waiter;
wait.func = nfs4_wake_lock_waiter; wait.func = nfs4_wake_lock_waiter;
add_wait_queue(q, &wait);
while(!signalled()) { while(!signalled()) {
add_wait_queue(q, &wait);
status = nfs4_proc_setlk(state, cmd, request); status = nfs4_proc_setlk(state, cmd, request);
if ((status != -EAGAIN) || IS_SETLK(cmd)) if ((status != -EAGAIN) || IS_SETLK(cmd)) {
finish_wait(q, &wait);
break; break;
}
status = -ERESTARTSYS; status = -ERESTARTSYS;
freezer_do_not_count(); freezer_do_not_count();
wait_woken(&wait, TASK_INTERRUPTIBLE, NFS4_LOCK_MAXTIMEOUT); wait_woken(&wait, TASK_INTERRUPTIBLE, NFS4_LOCK_MAXTIMEOUT);
freezer_count(); freezer_count();
finish_wait(q, &wait);
} }
finish_wait(q, &wait);
return status; return status;
} }
#else /* !CONFIG_NFS_V4_1 */ #else /* !CONFIG_NFS_V4_1 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment