Commit 57174593 authored by Jeff Layton's avatar Jeff Layton Committed by Anna Schumaker

nfs4: wake any lock waiters on successful RECLAIM_COMPLETE

If we have a RECLAIM_COMPLETE with a populated cl_lock_waitq, then
that implies that a reconnect has occurred. Since we can't expect a
CB_NOTIFY_LOCK callback at that point, just wake up the entire queue
so that all the tasks can re-poll for their locks.
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 56566103
...@@ -6621,20 +6621,24 @@ static int ...@@ -6621,20 +6621,24 @@ static int
nfs4_wake_lock_waiter(wait_queue_entry_t *wait, unsigned int mode, int flags, void *key) nfs4_wake_lock_waiter(wait_queue_entry_t *wait, unsigned int mode, int flags, void *key)
{ {
int ret; int ret;
struct cb_notify_lock_args *cbnl = key;
struct nfs4_lock_waiter *waiter = wait->private; struct nfs4_lock_waiter *waiter = wait->private;
struct nfs_lowner *lowner = &cbnl->cbnl_owner,
*wowner = waiter->owner;
/* Only wake if the callback was for the same owner. */ /* NULL key means to wake up everyone */
if (lowner->id != wowner->id || lowner->s_dev != wowner->s_dev) if (key) {
return 0; struct cb_notify_lock_args *cbnl = key;
struct nfs_lowner *lowner = &cbnl->cbnl_owner,
*wowner = waiter->owner;
/* Make sure it's for the right inode */ /* Only wake if the callback was for the same owner. */
if (nfs_compare_fh(NFS_FH(waiter->inode), &cbnl->cbnl_fh)) if (lowner->id != wowner->id || lowner->s_dev != wowner->s_dev)
return 0; return 0;
waiter->notified = true; /* Make sure it's for the right inode */
if (nfs_compare_fh(NFS_FH(waiter->inode), &cbnl->cbnl_fh))
return 0;
waiter->notified = true;
}
/* override "private" so we can use default_wake_function */ /* override "private" so we can use default_wake_function */
wait->private = waiter->task; wait->private = waiter->task;
...@@ -8413,6 +8417,8 @@ static int nfs41_reclaim_complete_handle_errors(struct rpc_task *task, struct nf ...@@ -8413,6 +8417,8 @@ static int nfs41_reclaim_complete_handle_errors(struct rpc_task *task, struct nf
{ {
switch(task->tk_status) { switch(task->tk_status) {
case 0: case 0:
wake_up_all(&clp->cl_lock_waitq);
/* Fallthrough */
case -NFS4ERR_COMPLETE_ALREADY: case -NFS4ERR_COMPLETE_ALREADY:
case -NFS4ERR_WRONG_CRED: /* What to do here? */ case -NFS4ERR_WRONG_CRED: /* What to do here? */
break; break;
......
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