summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ecdd03b)
Lookup the callback cred once and then use it for all subsequent
callbacks.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
(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)
{
struct nfs4_client *clp = data;
static int do_probe_callback(void *data)
{
struct nfs4_client *clp = data;
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
.rpc_argp = clp,
};
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
.rpc_argp = clp,
};
+ 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);
if (status)
warn_no_callback_path(clp, status);
else
if (status)
warn_no_callback_path(clp, status);
else
struct rpc_message msg = {
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
.rpc_argp = cbr,
struct rpc_message msg = {
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
.rpc_argp = cbr,
+ .rpc_cred = clp->cl_callback.cb_cred
};
int retries = 1;
int status = 0;
};
int retries = 1;
int status = 0;
clp->cl_callback.cb_client = NULL;
rpc_shutdown_client(clnt);
}
clp->cl_callback.cb_client = NULL;
rpc_shutdown_client(clnt);
}
+ if (clp->cl_callback.cb_cred) {
+ put_rpccred(clp->cl_callback.cb_cred);
+ clp->cl_callback.cb_cred = NULL;
+ }
/* RPC client info */
atomic_t cb_set; /* successful CB_NULL call */
struct rpc_clnt * cb_client;
/* RPC client info */
atomic_t cb_set; /* successful CB_NULL call */
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 */