Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6150ef0d authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: remove unused CHECK_FH flag 



All users now pass this, so it's meaningless.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 7e0f7cf5

fs/nfsd/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	/* check stateid */

	if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh,

				&read->rd_stateid,

				CHECK_FH | RD_STATE, &read->rd_filp))) {

				RD_STATE, &read->rd_filp))) {

		dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");

		goto out;

	}
@@ -651,7 +651,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {

		nfs4_lock_state();

		status = nfs4_preprocess_stateid_op(&cstate->current_fh,

			&setattr->sa_stateid, CHECK_FH | WR_STATE, NULL);

			&setattr->sa_stateid, WR_STATE, NULL);

		nfs4_unlock_state();

		if (status) {

			dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");
@@ -690,7 +690,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 


	nfs4_lock_state();

	status = nfs4_preprocess_stateid_op(&cstate->current_fh, stateid,

					CHECK_FH | WR_STATE, &filp);

					WR_STATE, &filp);

	if (filp)

		get_file(filp);

	nfs4_unlock_state();

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -2091,7 +2091,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl 
		stp = find_stateid(stateid, flags);

		if (!stp)

			goto out;

		if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp))

		if (nfs4_check_fh(current_fh, stp))

			goto out;

		if (!stp->st_stateowner->so_confirmed)

			goto out;

include/linux/nfsd/state.h

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ struct nfs4_stateid { 
};



/* flags for preprocess_seqid_op() */

#define CHECK_FH                0x00000001

#define CONFIRM                 0x00000002

#define OPEN_STATE              0x00000004

#define LOCK_STATE              0x00000008