diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-02-21 16:36:16 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-03-18 17:38:37 -0400 |
commit | 6150ef0dc7f734366d297e2eb5697ae458a1ea19 (patch) | |
tree | 0a11653b66953b808d2a1a98dc8da0f649c875f3 /fs/nfsd | |
parent | 7e0f7cf582abd6c85232331dfe726a4e4b0fd98e (diff) |
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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4proc.c | 6 | ||||
-rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index af66073ed423..77f584f69dfe 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
@@ -519,7 +519,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
519 | /* check stateid */ | 519 | /* check stateid */ |
520 | if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh, | 520 | if ((status = nfs4_preprocess_stateid_op(&cstate->current_fh, |
521 | &read->rd_stateid, | 521 | &read->rd_stateid, |
522 | CHECK_FH | RD_STATE, &read->rd_filp))) { | 522 | RD_STATE, &read->rd_filp))) { |
523 | dprintk("NFSD: nfsd4_read: couldn't process stateid!\n"); | 523 | dprintk("NFSD: nfsd4_read: couldn't process stateid!\n"); |
524 | goto out; | 524 | goto out; |
525 | } | 525 | } |
@@ -651,7 +651,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
651 | if (setattr->sa_iattr.ia_valid & ATTR_SIZE) { | 651 | if (setattr->sa_iattr.ia_valid & ATTR_SIZE) { |
652 | nfs4_lock_state(); | 652 | nfs4_lock_state(); |
653 | status = nfs4_preprocess_stateid_op(&cstate->current_fh, | 653 | status = nfs4_preprocess_stateid_op(&cstate->current_fh, |
654 | &setattr->sa_stateid, CHECK_FH | WR_STATE, NULL); | 654 | &setattr->sa_stateid, WR_STATE, NULL); |
655 | nfs4_unlock_state(); | 655 | nfs4_unlock_state(); |
656 | if (status) { | 656 | if (status) { |
657 | dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n"); | 657 | dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n"); |
@@ -690,7 +690,7 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
690 | 690 | ||
691 | nfs4_lock_state(); | 691 | nfs4_lock_state(); |
692 | status = nfs4_preprocess_stateid_op(&cstate->current_fh, stateid, | 692 | status = nfs4_preprocess_stateid_op(&cstate->current_fh, stateid, |
693 | CHECK_FH | WR_STATE, &filp); | 693 | WR_STATE, &filp); |
694 | if (filp) | 694 | if (filp) |
695 | get_file(filp); | 695 | get_file(filp); |
696 | nfs4_unlock_state(); | 696 | nfs4_unlock_state(); |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6ae28e606afc..5957f7766bdc 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2091,7 +2091,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl | |||
2091 | stp = find_stateid(stateid, flags); | 2091 | stp = find_stateid(stateid, flags); |
2092 | if (!stp) | 2092 | if (!stp) |
2093 | goto out; | 2093 | goto out; |
2094 | if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) | 2094 | if (nfs4_check_fh(current_fh, stp)) |
2095 | goto out; | 2095 | goto out; |
2096 | if (!stp->st_stateowner->so_confirmed) | 2096 | if (!stp->st_stateowner->so_confirmed) |
2097 | goto out; | 2097 | goto out; |