AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

nfsd4: lookup up callback cred only once

Browse Source 
Lookup the callback cred once and then use it for all subsequent
callbacks.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2009-02-23 21:42:10 -08:00
parent ecdd03b791
commit 3cef9ab266
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/nfsd/nfs4callback.c
View File

@ -415,6 +415,22 @@ static void warn_no_callback_path(struct nfs4_client *clp, int reason)
(int)clp->cl_name.len, clp->cl_name.data, reason); (int)clp->cl_name.len, clp->cl_name.data, reason);
} }
static struct rpc_cred *lookup_cb_cred(struct nfs4_callback *cb)
{
struct auth_cred acred = {
.machine_cred = 1
};
/*
* 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);
}
static int do_probe_callback(void *data) static int do_probe_callback(void *data)
{ {
struct nfs4_client *clp = data; struct nfs4_client *clp = data;
@ -423,9 +439,18 @@ static int do_probe_callback(void *data)
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL], .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
.rpc_argp = clp, .rpc_argp = clp,
}; };
struct rpc_cred *cred;
int status; 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_sync(cb->cb_client, &msg, RPC_TASK_SOFT); status = rpc_call_sync(cb->cb_client, &msg, RPC_TASK_SOFT);
out:
if (status) if (status)
warn_no_callback_path(clp, status); warn_no_callback_path(clp, status);
else else
@ -475,6 +500,7 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL], .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
.rpc_argp = cbr, .rpc_argp = cbr,
.rpc_cred = clp->cl_callback.cb_cred
}; };
int retries = 1; int retries = 1;
int status = 0; int status = 0;

4
fs/nfsd/nfs4state.c
View File

@ -643,6 +643,10 @@ shutdown_callback_client(struct nfs4_client *clp)
clp->cl_callback.cb_client = NULL; clp->cl_callback.cb_client = NULL;
rpc_shutdown_client(clnt); rpc_shutdown_client(clnt);
} }
if (clp->cl_callback.cb_cred) {
put_rpccred(clp->cl_callback.cb_cred);
clp->cl_callback.cb_cred = NULL;
}
} }
static inline void static inline void

1
include/linux/nfsd/state.h
View File

@ -97,6 +97,7 @@ struct nfs4_callback {
/* RPC client info */ /* RPC client info */
atomic_t cb_set; /* successful CB_NULL call */ atomic_t cb_set; /* successful CB_NULL call */
struct rpc_clnt * cb_client; struct rpc_clnt * cb_client;
struct rpc_cred * cb_cred;
}; };
/* Maximum number of slots per session. 128 is useful for long haul TCP */ /* Maximum number of slots per session. 128 is useful for long haul TCP */