diff options
| author | Olga Kornievskaia <kolga@netapp.com> | 2018-09-13 19:58:24 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2019-12-09 17:42:14 +0100 |
| commit | 51100d2b87cba12b09db79fa6577adccc0c2d14f (patch) | |
| tree | 4f60973a683dde4cc1e0722bccfce2d22264b571 /fs/nfsd/nfs4state.c | |
| parent | NFSD check stateids against copy stateids (diff) | |
| download | linux-51100d2b87cba12b09db79fa6577adccc0c2d14f.tar.xz linux-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/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 31b71aed4230..ed5e80b3ac1f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -7930,7 +7930,8 @@ nfs4_state_shutdown(void) static void get_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid) { - if (HAS_STATE_ID(cstate, CURRENT_STATE_ID_FLAG) && CURRENT_STATEID(stateid)) + if (HAS_CSTATE_FLAG(cstate, CURRENT_STATE_ID_FLAG) && + CURRENT_STATEID(stateid)) memcpy(stateid, &cstate->current_stateid, sizeof(stateid_t)); } @@ -7939,14 +7940,14 @@ put_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid) { if (cstate->minorversion) { memcpy(&cstate->current_stateid, stateid, sizeof(stateid_t)); - SET_STATE_ID(cstate, CURRENT_STATE_ID_FLAG); + SET_CSTATE_FLAG(cstate, CURRENT_STATE_ID_FLAG); } } void clear_current_stateid(struct nfsd4_compound_state *cstate) { - CLEAR_STATE_ID(cstate, CURRENT_STATE_ID_FLAG); + CLEAR_CSTATE_FLAG(cstate, CURRENT_STATE_ID_FLAG); } /* |