nfsd41: save and restore current stateid with current fh
Tigran Mkrtchyan [Mon, 13 Feb 2012 21:55:28 +0000 (22:55 +0100)]
Signed-off-by: Tigran Mkrtchyan <kofemann@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

fs/nfsd/nfs4proc.c
fs/nfsd/xdr4.h

index f1dd270..32a291a 100644 (file)
@@ -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;
 }
 
index b49ffe8..3c1ddd7 100644 (file)
@@ -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)