Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/nfs/nfs4proc.c

+2 −4
Original line number Diff line number Diff line
@@ -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 */