diff options
| author |   Olga Kornievskaia <kolga@netapp.com> | 2018-09-13 13:58:24 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2019-12-09 11:42:14 -0500 |
| commit | 51100d2b87cba12b09db79fa6577adccc0c2d14f (patch) | |
| tree | 4f60973a683dde4cc1e0722bccfce2d22264b571 /fs/nfsd/nfs4proc.c | |
| parent | NFSD check stateids against copy stateids (diff) | |
| download | linux-dev-51100d2b87cba12b09db79fa6577adccc0c2d14f.tar.xz linux-dev-51100d2b87cba12b09db79fa6577adccc0c2d14f.zip | |
NFSD generalize nfsd4_compound_state flag names
Allow for sid_flag field non-stateid use.
Signed-off-by: Andy Adamson <andros@netapp.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index dee5aec098fd..8cc9f6e91874 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -531,9 +531,9 @@ nfsd4_restorefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return nfserr_restorefh; fh_dup2(&cstate->current_fh, &cstate->save_fh); - if (HAS_STATE_ID(cstate, SAVED_STATE_ID_FLAG)) { + if (HAS_CSTATE_FLAG(cstate, SAVED_STATE_ID_FLAG)) { memcpy(&cstate->current_stateid, &cstate->save_stateid, sizeof(stateid_t)); - SET_STATE_ID(cstate, CURRENT_STATE_ID_FLAG); + SET_CSTATE_FLAG(cstate, CURRENT_STATE_ID_FLAG); } return nfs_ok; } @@ -543,9 +543,9 @@ nfsd4_savefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, union nfsd4_op_u *u) { fh_dup2(&cstate->save_fh, &cstate->current_fh); - if (HAS_STATE_ID(cstate, CURRENT_STATE_ID_FLAG)) { + if (HAS_CSTATE_FLAG(cstate, CURRENT_STATE_ID_FLAG)) { memcpy(&cstate->save_stateid, &cstate->current_stateid, sizeof(stateid_t)); - SET_STATE_ID(cstate, SAVED_STATE_ID_FLAG); + SET_CSTATE_FLAG(cstate, SAVED_STATE_ID_FLAG); } return nfs_ok; } |