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

nfs4: don't compare clientid in nfs4_wake_lock_waiter

The task is expected to sleep for a while here, and it's possible that
a new EXCHANGE_ID has occurred in the interim, and we were assigned a
new clientid. Since this is a per-client list, there isn't a lot of
value in vetting the clientid on the incoming request.
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 41a74620
...@@ -6626,10 +6626,8 @@ nfs4_wake_lock_waiter(wait_queue_entry_t *wait, unsigned int mode, int flags, vo ...@@ -6626,10 +6626,8 @@ nfs4_wake_lock_waiter(wait_queue_entry_t *wait, unsigned int mode, int flags, vo
struct nfs_lowner *lowner = &cbnl->cbnl_owner, struct nfs_lowner *lowner = &cbnl->cbnl_owner,
*wowner = waiter->owner; *wowner = waiter->owner;
/* Only wake if the callback was for the same owner */ /* Only wake if the callback was for the same owner. */
if (lowner->clientid != wowner->clientid || if (lowner->id != wowner->id || lowner->s_dev != wowner->s_dev)
lowner->id != wowner->id ||
lowner->s_dev != wowner->s_dev)
return 0; return 0;
/* Make sure it's for the right inode */ /* Make sure it's for the right inode */
......
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