diff options
author | Benny Halevy <bhalevy@primarydata.com> | 2013-10-15 02:57:55 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2013-10-28 15:58:20 -0400 |
commit | 5d7dab83e3e55e81a88c406da71afde0ebaa6ad8 (patch) | |
tree | 34773e8b12f70aa456ccd025c2f2cb24d5ddedf1 /fs/nfsd | |
parent | 9857df815f17417be116f800636f460e247afb5a (diff) |
nfsd: nfs4_open_delegation needs to remove_stid rather than unhash_stid
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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9cb1b17014f5..3feb38e818ab 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -3159,7 +3159,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh, | |||
3159 | open->op_delegate_type = NFS4_OPEN_DELEGATE_READ; | 3159 | open->op_delegate_type = NFS4_OPEN_DELEGATE_READ; |
3160 | return; | 3160 | return; |
3161 | out_free: | 3161 | out_free: |
3162 | unhash_stid(&dp->dl_stid); | 3162 | remove_stid(&dp->dl_stid); |
3163 | nfs4_put_delegation(dp); | 3163 | nfs4_put_delegation(dp); |
3164 | out_no_deleg: | 3164 | out_no_deleg: |
3165 | open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE; | 3165 | open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE; |