projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
292f503
)
NFS fix error return in nfs4_select_rw_stateid
author
Andy Adamson
<andros@netapp.com>
Tue, 18 Feb 2014 15:36:05 +0000
(10:36 -0500)
committer
Trond Myklebust
<trond.myklebust@primarydata.com>
Wed, 19 Feb 2014 14:31:56 +0000
(09:31 -0500)
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:
ef1820f9be27b
(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>
fs/nfs/nfs4state.c
patch
|
blob
|
blame
|
history
diff --git
a/fs/nfs/nfs4state.c
b/fs/nfs/nfs4state.c
index e5be72518bd7ebe813522b1c24f7fa16b539421e..e1a47217c05e14b7195fae25d5fc725f6983cd03 100644
(file)
--- a/
fs/nfs/nfs4state.c
+++ b/
fs/nfs/nfs4state.c
@@
-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