NFSv4.1: Fix a race where CB_NOTIFY_LOCK fails to wake a waiter
authorBenjamin Coddington <>
Fri, 28 Jul 2017 16:33:54 +0000 (12:33 -0400)
committerAnna Schumaker <>
Fri, 28 Jul 2017 19:35:30 +0000 (15:35 -0400)
nfs4_retry_setlk() sets the task's state to TASK_INTERRUPTIBLE within the
same region protected by the wait_queue's lock after checking for a
notification from CB_NOTIFY_LOCK callback.  However, after releasing that
lock, a wakeup for that task may race in before the call to
freezable_schedule_timeout_interruptible() and set TASK_WAKING, then
freezable_schedule_timeout_interruptible() will set the state back to
TASK_INTERRUPTIBLE before the task will sleep.  The result is that the task
will sleep for the entire duration of the timeout.

Since we've already set TASK_INTERRUPTIBLE in the locked section, just use
freezable_schedule_timout() instead.

Fixes: a1d617d8f134 ("nfs: allow blocking locks to be awoken by lock callbacks")
Signed-off-by: Benjamin Coddington <>
Reviewed-by: Jeff Layton <>
Cc: # v4.9+
Signed-off-by: Anna Schumaker <>

index 583c2b3..93c1d73 100644 (file)
@@ -6495,7 +6495,7 @@ nfs4_retry_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
                spin_unlock_irqrestore(&q->lock, flags);
-               freezable_schedule_timeout_interruptible(NFS4_LOCK_MAXTIMEOUT);
+               freezable_schedule_timeout(NFS4_LOCK_MAXTIMEOUT);
        finish_wait(q, &wait);