nfsd4: remove unused CHECK_FH flag
All users now pass this, so it's meaningless. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
7e0f7cf582
commit
6150ef0dc7
|
@ -519,7 +519,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
|
||||||
/* check stateid */
|
/* check stateid */
|
||||||
if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh,
|
if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh,
|
||||||
&read->rd_stateid,
|
&read->rd_stateid,
|
||||||
CHECK_FH | RD_STATE, &read->rd_filp))) {
|
RD_STATE, &read->rd_filp))) {
|
||||||
dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");
|
dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");
|
||||||
goto out;
|
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) {
|
if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
|
||||||
nfs4_lock_state();
|
nfs4_lock_state();
|
||||||
status = nfs4_preprocess_stateid_op(&cstate->current_fh,
|
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();
|
nfs4_unlock_state();
|
||||||
if (status) {
|
if (status) {
|
||||||
dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");
|
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();
|
nfs4_lock_state();
|
||||||
status = nfs4_preprocess_stateid_op(&cstate->current_fh, stateid,
|
status = nfs4_preprocess_stateid_op(&cstate->current_fh, stateid,
|
||||||
CHECK_FH | WR_STATE, &filp);
|
WR_STATE, &filp);
|
||||||
if (filp)
|
if (filp)
|
||||||
get_file(filp);
|
get_file(filp);
|
||||||
nfs4_unlock_state();
|
nfs4_unlock_state();
|
||||||
|
|
|
@ -2091,7 +2091,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
|
||||||
stp = find_stateid(stateid, flags);
|
stp = find_stateid(stateid, flags);
|
||||||
if (!stp)
|
if (!stp)
|
||||||
goto out;
|
goto out;
|
||||||
if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp))
|
if (nfs4_check_fh(current_fh, stp))
|
||||||
goto out;
|
goto out;
|
||||||
if (!stp->st_stateowner->so_confirmed)
|
if (!stp->st_stateowner->so_confirmed)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
@ -256,7 +256,6 @@ struct nfs4_stateid {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* flags for preprocess_seqid_op() */
|
/* flags for preprocess_seqid_op() */
|
||||||
#define CHECK_FH 0x00000001
|
|
||||||
#define CONFIRM 0x00000002
|
#define CONFIRM 0x00000002
|
||||||
#define OPEN_STATE 0x00000004
|
#define OPEN_STATE 0x00000004
|
||||||
#define LOCK_STATE 0x00000008
|
#define LOCK_STATE 0x00000008
|
||||||
|
|
Loading…
Reference in a new issue