nfsd4: use common rpc_cred for all callbacks

[safe/jmp/linux-2.6] / fs / nfsd / nfs4callback.c

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 3fd23f7..1285197 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -56,7 +56,7 @@
 /* Index of predefined Linux callback client operations */
 
 enum {
-        NFSPROC4_CLNT_CB_NULL = 0,
+       NFSPROC4_CLNT_CB_NULL = 0,
        NFSPROC4_CLNT_CB_RECALL,
 };
 
@@ -377,7 +377,6 @@ static int max_cb_time(void)
 
 int setup_callback_client(struct nfs4_client *clp)
 {
-       struct sockaddr_in      addr;
        struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
        struct rpc_timeout      timeparms = {
                .to_initval     = max_cb_time(),
@@ -385,8 +384,8 @@ int setup_callback_client(struct nfs4_client *clp)
        };
        struct rpc_create_args args = {
                .protocol       = IPPROTO_TCP,
-               .address        = (struct sockaddr *)&addr,
-               .addrsize       = sizeof(addr),
+               .address        = (struct sockaddr *) &cb->cb_addr,
+               .addrsize       = cb->cb_addrlen,
                .timeout        = &timeparms,
                .program        = &cb_program,
                .prognumber     = cb->cb_prog,
@@ -400,12 +399,6 @@ int setup_callback_client(struct nfs4_client *clp)
        if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5))
                return -EINVAL;
 
-       /* Initialize address */
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_port = htons(cb->cb_port);
-       addr.sin_addr.s_addr = htonl(cb->cb_addr);
-
        /* Create RPC client */
        client = rpc_create(&args);
        if (IS_ERR(client)) {
@@ -439,42 +432,29 @@ static const struct rpc_call_ops nfsd4_cb_probe_ops = {
        .rpc_call_done = nfsd4_cb_probe_done,
 };
 
-static struct rpc_cred *lookup_cb_cred(struct nfs4_cb_conn *cb)
-{
-       struct auth_cred acred = {
-               .machine_cred = 1
-       };
+static struct rpc_cred *callback_cred;
 
-       /*
-        * Note in the gss case this doesn't actually have to wait for a
-        * gss upcall (or any calls to the client); this just creates a
-        * non-uptodate cred which the rpc state machine will fill in with
-        * a refresh_upcall later.
-        */
-       return rpcauth_lookup_credcache(cb->cb_client->cl_auth, &acred,
-                                                       RPCAUTH_LOOKUP_NEW);
+int set_callback_cred(void)
+{
+       callback_cred = rpc_lookup_machine_cred();
+       if (!callback_cred)
+               return -ENOMEM;
+       return 0;
 }
 
+
 void do_probe_callback(struct nfs4_client *clp)
 {
        struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
        struct rpc_message msg = {
                .rpc_proc       = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
                .rpc_argp       = clp,
+               .rpc_cred       = callback_cred
        };
-       struct rpc_cred *cred;
        int status;
 
-       cred = lookup_cb_cred(cb);
-       if (IS_ERR(cred)) {
-               status = PTR_ERR(cred);
-               goto out;
-       }
-       cb->cb_cred = cred;
-       msg.rpc_cred = cb->cb_cred;
        status = rpc_call_async(cb->cb_client, &msg, RPC_TASK_SOFT,
                                &nfsd4_cb_probe_ops, (void *)clp);
-out:
        if (status) {
                warn_no_callback_path(clp, status);
                put_nfs4_client(clp);
@@ -557,7 +537,7 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
        struct rpc_message msg = {
                .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
                .rpc_argp = dp,
-               .rpc_cred = clp->cl_cb_conn.cb_cred
+               .rpc_cred = callback_cred
        };
        int status;