diff options
| author | Trond Myklebust | 2014-07-30 03:34:17 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2014-07-31 20:20:11 +0200 |
| commit | 67cb1279be27345ba6855c1aab9e90ef5f5ac645 (patch) | |
| tree | 95ee523a7fa97da01978ee5ce81f48e1eabe3730 /fs/nfsd | |
| parent | nfsd: nfsd4_locku() must reference the lock stateid (diff) | |
| download | kernel-qcow2-linux-67cb1279be27345ba6855c1aab9e90ef5f5ac645.tar.gz kernel-qcow2-linux-67cb1279be27345ba6855c1aab9e90ef5f5ac645.tar.xz kernel-qcow2-linux-67cb1279be27345ba6855c1aab9e90ef5f5ac645.zip | |
nfsd: Ensure that nfs4_open_delegation() references the delegation stateid
Ensure that nfs4_open_delegation() keeps a reference to the delegation
stateid until it is done working with it. Necessary step toward
client_mutex removal.
Signed-off-by: Trond Myklebust <trond.myklebust@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, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 4f191456d737..2df6af93120e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -674,6 +674,7 @@ hash_delegation_locked(struct nfs4_delegation *dp, struct nfs4_file *fp) lockdep_assert_held(&state_lock); lockdep_assert_held(&fp->fi_lock); + atomic_inc(&dp->dl_stid.sc_count); dp->dl_stid.sc_type = NFS4_DELEG_STID; list_add(&dp->dl_perfile, &fp->fi_delegations); list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations); @@ -3704,6 +3705,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, dprintk("NFSD: delegation stateid=" STATEID_FMT "\n", STATEID_VAL(&dp->dl_stid.sc_stateid)); open->op_delegate_type = NFS4_OPEN_DELEGATE_READ; + nfs4_put_stid(&dp->dl_stid); return; out_no_deleg: open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE; |