Merge tag 'nfsd-4.5' of git://linux-nfs.org/~bfields/linux

[cascardo/linux.git] / fs / nfsd / state.h

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 77fdf4d..c050c53 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -65,7 +65,7 @@ struct nfsd4_callback {
        struct nfs4_client *cb_clp;
        u32 cb_minorversion;
        struct rpc_message cb_msg;
-       struct nfsd4_callback_ops *cb_ops;
+       const struct nfsd4_callback_ops *cb_ops;
        struct work_struct cb_work;
        int cb_seq_status;
        int cb_status;
@@ -578,8 +578,8 @@ struct nfsd4_compound_state;
 struct nfsd_net;
 
 extern __be32 nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,
-               struct nfsd4_compound_state *cstate, stateid_t *stateid,
-               int flags, struct file **filp, bool *tmp_file);
+               struct nfsd4_compound_state *cstate, struct svc_fh *fhp,
+               stateid_t *stateid, int flags, struct file **filp, bool *tmp_file);
 __be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
                     stateid_t *stateid, unsigned char typemask,
                     struct nfs4_stid **s, struct nfsd_net *nn);
@@ -599,7 +599,7 @@ extern void nfsd4_probe_callback(struct nfs4_client *clp);
 extern void nfsd4_probe_callback_sync(struct nfs4_client *clp);
 extern void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *);
 extern void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
-               struct nfsd4_callback_ops *ops, enum nfsd4_cb_op op);
+               const struct nfsd4_callback_ops *ops, enum nfsd4_cb_op op);
 extern void nfsd4_run_cb(struct nfsd4_callback *cb);
 extern int nfsd4_create_callback_queue(void);
 extern void nfsd4_destroy_callback_queue(void);