SUNRPC: Clean up rpcauth_bindcred()

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

3 files changed, 23 insertions, 20 deletions

diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index 012566a6257b..348546c7826c 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -135,9 +135,7 @@ void			rpcauth_release(struct rpc_auth *);
 struct rpc_cred *       rpcauth_lookup_credcache(struct rpc_auth *, struct auth_cred *, int);
 void                    rpcauth_init_cred(struct rpc_cred *, const struct auth_cred *, struct rpc_auth *, const struct rpc_credops *);
 struct rpc_cred *       rpcauth_lookupcred(struct rpc_auth *, int);
-void                    rpcauth_bindcred(struct rpc_task *);
-void                    rpcauth_bind_root_cred(struct rpc_task *);
-void                    rpcauth_holdcred(struct rpc_task *);
+void                    rpcauth_bindcred(struct rpc_task *, struct rpc_cred *, int);
 void                    put_rpccred(struct rpc_cred *);
 void                    rpcauth_unbindcred(struct rpc_task *);
 __be32 *                rpcauth_marshcred(struct rpc_task *, __be32 *);
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index b0f2b2ee7cc0..1cdb163c4f89 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -375,7 +375,15 @@ rpcauth_init_cred(struct rpc_cred *cred, const struct auth_cred *acred,
 }
 EXPORT_SYMBOL_GPL(rpcauth_init_cred);
 
-void
+static void
+rpcauth_generic_bind_cred(struct rpc_task *task, struct rpc_cred *cred)
+{
+        task->tk_msg.rpc_cred = get_rpccred(cred);
+        dprintk("RPC: %5u holding %s cred %p\n", task->tk_pid,
+                        cred->cr_auth->au_ops->au_name, cred);
+}
+
+static void
 rpcauth_bind_root_cred(struct rpc_task *task)
 {
         struct rpc_auth *auth = task->tk_client->cl_auth;
@@ -394,8 +402,8 @@ rpcauth_bind_root_cred(struct rpc_task *task)
                 task->tk_status = PTR_ERR(ret);
 }
 
-void
-rpcauth_bindcred(struct rpc_task *task)
+static void
+rpcauth_bind_new_cred(struct rpc_task *task)
 {
         struct rpc_auth *auth = task->tk_client->cl_auth;
         struct rpc_cred *ret;
@@ -410,14 +418,14 @@ rpcauth_bindcred(struct rpc_task *task)
 }
 
 void
-rpcauth_holdcred(struct rpc_task *task)
+rpcauth_bindcred(struct rpc_task *task, struct rpc_cred *cred, int flags)
 {
-        struct rpc_cred *cred = task->tk_msg.rpc_cred;
-        if (cred != NULL) {
-                get_rpccred(cred);
-                dprintk("RPC: %5u holding %s cred %p\n", task->tk_pid,
-                                cred->cr_auth->au_ops->au_name, cred);
-        }
+        if (cred != NULL)
+                rpcauth_generic_bind_cred(task, cred);
+        else if (flags & RPC_TASK_ROOTCREDS)
+                rpcauth_bind_root_cred(task);
+        else
+                rpcauth_bind_new_cred(task);
 }
 
 void
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 7db956f6e018..6eab9bf94baf 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -817,14 +817,11 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta
                 task->tk_action = rpc_prepare_task;
 
         if (task_setup_data->rpc_message != NULL) {
-                memcpy(&task->tk_msg, task_setup_data->rpc_message, sizeof(task->tk_msg));
+                task->tk_msg.rpc_proc = task_setup_data->rpc_message->rpc_proc;
+                task->tk_msg.rpc_argp = task_setup_data->rpc_message->rpc_argp;
+                task->tk_msg.rpc_resp = task_setup_data->rpc_message->rpc_resp;
                 /* Bind the user cred */
-                if (task->tk_msg.rpc_cred != NULL)
-                        rpcauth_holdcred(task);
-                else if (!(task_setup_data->flags & RPC_TASK_ROOTCREDS))
-                        rpcauth_bindcred(task);
-                else
-                        rpcauth_bind_root_cred(task);
+                rpcauth_bindcred(task, task_setup_data->rpc_message->rpc_cred, task_setup_data->flags);
                 if (task->tk_action == NULL)
                         rpc_call_start(task);
         }