projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9857df8
)
nfsd: nfs4_open_delegation needs to remove_stid rather than unhash_stid
author
Benny Halevy
<bhalevy@primarydata.com>
Tue, 15 Oct 2013 06:57:55 +0000
(09:57 +0300)
committer
J. Bruce Fields
<bfields@redhat.com>
Mon, 28 Oct 2013 19:58:20 +0000
(15:58 -0400)
In the out_free: path, the newly allocated stid must be removed rather
than unhashed so it can never be found.
Signed-off-by: Benny Halevy <bhalevy@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c
patch
|
blob
|
history
diff --git
a/fs/nfsd/nfs4state.c
b/fs/nfsd/nfs4state.c
index 9cb1b17014f598cc5c52c791459b0cda52b1ea05..3feb38e818abde447d3bf463846705e2e9cc662a 100644
(file)
--- a/
fs/nfsd/nfs4state.c
+++ b/
fs/nfsd/nfs4state.c
@@
-3159,7
+3159,7
@@
nfs4_open_delegation(struct net *net, struct svc_fh *fh,
open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
return;
out_free:
-
unhash
_stid(&dp->dl_stid);
+
remove
_stid(&dp->dl_stid);
nfs4_put_delegation(dp);
out_no_deleg:
open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE;