diff options
| author | Trond Myklebust | 2014-07-30 03:34:19 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2014-07-31 20:20:12 +0200 |
| commit | d6f2bc5dcf58259b6c3f206ae8f14087300b5bcf (patch) | |
| tree | f5aef39e98705f4bd1a5b2bb269e5675faf2de1c /fs/nfsd/nfs4state.c | |
| parent | nfsd: nfsd4_process_open2() must reference the delegation stateid (diff) | |
| download | kernel-qcow2-linux-d6f2bc5dcf58259b6c3f206ae8f14087300b5bcf.tar.gz kernel-qcow2-linux-d6f2bc5dcf58259b6c3f206ae8f14087300b5bcf.tar.xz kernel-qcow2-linux-d6f2bc5dcf58259b6c3f206ae8f14087300b5bcf.zip | |
nfsd: nfsd4_process_open2() must reference the open stateid
Ensure that nfsd4_process_open2() keeps a reference to the open
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/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5cb6305036cd..f3018cb26769 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2996,6 +2996,7 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open, static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *open) { struct nfs4_openowner *oo = open->op_openowner; + atomic_inc(&stp->st_stid.sc_count); stp->st_stid.sc_type = NFS4_OPEN_STID; INIT_LIST_HEAD(&stp->st_locks); stp->st_stateowner = &oo->oo_owner; @@ -3376,6 +3377,7 @@ nfsd4_find_existing_open(struct nfs4_file *fp, struct nfsd4_open *open) continue; if (local->st_stateowner == &oo->oo_owner) { ret = local; + atomic_inc(&ret->st_stid.sc_count); break; } } @@ -3836,6 +3838,8 @@ out: open->op_rflags |= NFS4_OPEN_RESULT_CONFIRM; if (dp) nfs4_put_stid(&dp->dl_stid); + if (stp) + nfs4_put_stid(&stp->st_stid); return status; } |