]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nfs4: don't compare clientid in nfs4_wake_lock_waiter
authorJeff Layton <jlayton@redhat.com>
Sun, 18 Mar 2018 12:37:02 +0000 (08:37 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Tue, 10 Apr 2018 20:06:22 +0000 (16:06 -0400)
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: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/nfs4proc.c

index 5ab28454f1175d1983fc447ffbdd4bd5ef0b0107..669ba9211177bee07a61421fcde51eb239ed6fe0 100644 (file)
@@ -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,
                                *wowner = waiter->owner;
 
-       /* Only wake if the callback was for the same owner */
-       if (lowner->clientid != wowner->clientid ||
-           lowner->id != wowner->id             ||
-           lowner->s_dev != wowner->s_dev)
+       /* Only wake if the callback was for the same owner. */
+       if (lowner->id != wowner->id || lowner->s_dev != wowner->s_dev)
                return 0;
 
        /* Make sure it's for the right inode */