aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/state.h
diff options
context:
space:
mode:
authorJeff Layton <jeff.layton@primarydata.com>2019-08-18 14:18:54 -0400
committerJ. Bruce Fields <bfields@redhat.com>2019-08-19 11:09:09 -0400
commit5c4583b2b78eef4eb33fca9a4598e72e08dd514b (patch)
treef3524c2892e15f83f45451017bad8547e77513df /fs/nfsd/state.h
parenteb82dd393744107ebc365a53e7813c7c67cb203b (diff)
nfsd: hook up nfs4_preprocess_stateid_op to the nfsd_file cache
Have nfs4_preprocess_stateid_op pass back a nfsd_file instead of a filp. Since we now presume that the struct file will be persistent in most cases, we can stop fiddling with the raparms in the read code. This also means that we don't really care about the rd_tmp_file field anymore. Signed-off-by: Jeff Layton <jeff.layton@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
-rw-r--r--fs/nfsd/state.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index d89d1ade1254..d00c86d05beb 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -616,7 +616,7 @@ struct nfsd4_copy;
616 616
617extern __be32 nfs4_preprocess_stateid_op(struct svc_rqst *rqstp, 617extern __be32 nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,
618 struct nfsd4_compound_state *cstate, struct svc_fh *fhp, 618 struct nfsd4_compound_state *cstate, struct svc_fh *fhp,
619 stateid_t *stateid, int flags, struct file **filp, bool *tmp_file); 619 stateid_t *stateid, int flags, struct nfsd_file **filp);
620__be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate, 620__be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
621 stateid_t *stateid, unsigned char typemask, 621 stateid_t *stateid, unsigned char typemask,
622 struct nfs4_stid **s, struct nfsd_net *nn); 622 struct nfs4_stid **s, struct nfsd_net *nn);