NFSD generalize nfsd4_compound_state flag names (51100d2b) · Commits · 戴 / test

fs/nfsd/nfs4proc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/*

+3 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@
		#define CURRENT_STATE_ID_FLAG (1<<0)
		#define SAVED_STATE_ID_FLAG (1<<1)

		#define SET_STATE_ID(c, f) ((c)->sid_flags \|= (f))
		#define HAS_STATE_ID(c, f) ((c)->sid_flags & (f))
		#define CLEAR_STATE_ID(c, f) ((c)->sid_flags &= ~(f))
		#define SET_CSTATE_FLAG(c, f) ((c)->sid_flags \|= (f))
		#define HAS_CSTATE_FLAG(c, f) ((c)->sid_flags & (f))
		#define CLEAR_CSTATE_FLAG(c, f) ((c)->sid_flags &= ~(f))

		struct nfsd4_compound_state {
		struct svc_fh current_fh;