diff options
| author | Tigran Mkrtchyan <kofemann@gmail.com> | 2012-02-13 22:55:28 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-02-15 11:20:41 -0500 |
| commit | 8307111476bcd6c3e126a06ba9240dfaef83ef63 (patch) | |
| tree | aecc5126b7928448f5ccd3a5673bd212e730ac3c /fs/nfsd | |
| parent | 80e01cc1e25de079e495e261f34be86d85f0797c (diff) | |
| download | blackbird-op-linux-8307111476bcd6c3e126a06ba9240dfaef83ef63.tar.gz blackbird-op-linux-8307111476bcd6c3e126a06ba9240dfaef83ef63.zip | |
nfsd41: save and restore current stateid with current fh
Signed-off-by: Tigran Mkrtchyan <kofemann@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/xdr4.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index f1dd2702b8fd..32a291af1b4e 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -453,6 +453,7 @@ nfsd4_restorefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return nfserr_restorefh; fh_dup2(&cstate->current_fh, &cstate->save_fh); + cstate->current_stateid = cstate->save_stateid; return nfs_ok; } @@ -464,6 +465,7 @@ nfsd4_savefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return nfserr_nofilehandle; fh_dup2(&cstate->save_fh, &cstate->current_fh); + cstate->save_stateid = cstate->current_stateid; return nfs_ok; } diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index b49ffe83e604..3c1ddd7f13a4 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -55,6 +55,7 @@ struct nfsd4_compound_state { u32 minorversion; u32 status; const stateid_t *current_stateid; + const stateid_t *save_stateid; }; static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs) |
