Commit 146d70ca authored Feb 18, 2014 by Andy Adamson Committed by Trond Myklebust Feb 19, 2014

NFS fix error return in nfs4_select_rw_stateid



Do not return an error when nfs4_copy_delegation_stateid succeeds.

Signed-off-by: Andy Adamson <andros@netapp.com>
Link: http://lkml.kernel.org/r/1392737765-41942-1-git-send-email-andros@netapp.com


Fixes: ef1820f9 (NFSv4: Don't try to recover NFSv4 locks when...)
Cc: NeilBrown <neilb@suse.de>
Cc: stable@vger.kernel.org # 3.12+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent 292f503c

fs/nfs/nfs4state.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1015,8 +1015,11 @@ int nfs4_select_rw_stateid(nfs4_stateid dst, struct nfs4_state state,
		if (ret == -EIO)
		/* A lost lock - don't even consider delegations */
		goto out;
		if (nfs4_copy_delegation_stateid(dst, state->inode, fmode))
		/* returns true if delegation stateid found and copied */
		if (nfs4_copy_delegation_stateid(dst, state->inode, fmode)) {
		ret = 0;
		goto out;
		}
		if (ret != -ENOENT)
		/* nfs4_copy_delegation_stateid() didn't over-write
		* dst, so it still has the lock stateid which we now