SUNRPC: Cleanup of rpc_task initialisation

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 10 insertions, 6 deletions

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index d9d5c5ad826c..ec9704181f94 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -126,7 +126,7 @@ int		rpcb_register(u32, u32, int, unsigned short, int *);
 int             rpcb_getport_sync(struct sockaddr_in *, __u32, __u32, int);
 void            rpcb_getport_async(struct rpc_task *);
 
-void            rpc_call_setup(struct rpc_task *, struct rpc_message *, int);
+void            rpc_call_setup(struct rpc_task *, const struct rpc_message *, int);
 
 int             rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg,
                                int flags, const struct rpc_call_ops *tk_ops,
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 8ea077db0099..9efe045fc376 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -117,6 +117,13 @@ struct rpc_call_ops {
         void (*rpc_release)(void *);
 };
 
+struct rpc_task_setup {
+        struct rpc_clnt *rpc_client;
+        const struct rpc_message *rpc_message;
+        const struct rpc_call_ops *callback_ops;
+        void *callback_data;
+        unsigned short flags;
+};
 
 /*
  * RPC task flags
@@ -236,13 +243,10 @@ struct rpc_wait_queue {
 /*
  * Function prototypes
  */
-struct rpc_task *rpc_new_task(struct rpc_clnt *, int flags,
-                                const struct rpc_call_ops *ops, void *data);
+struct rpc_task *rpc_new_task(const struct rpc_task_setup *);
 struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags,
                                 const struct rpc_call_ops *ops, void *data);
-void            rpc_init_task(struct rpc_task *task, struct rpc_clnt *clnt,
-                                int flags, const struct rpc_call_ops *ops,
-                                void *data);
+void            rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *);
 void            rpc_put_task(struct rpc_task *);
 void            rpc_exit_task(struct rpc_task *);
 void            rpc_release_calldata(const struct rpc_call_ops *, void *);