diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-02-23 10:45:27 -0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-04-29 16:44:47 -0400 |
| commit | e1cab5a5896e142190cd66a8287099b52e5855a7 (patch) | |
| tree | dbdf0c075a83b192a1e2e2d450cac65f720a4ec4 /fs/nfsd | |
| parent | 595947acaaef373445131471a78650003f5d8e7d (diff) | |
| download | linux-3.10-e1cab5a5896e142190cd66a8287099b52e5855a7.tar.gz linux-3.10-e1cab5a5896e142190cd66a8287099b52e5855a7.tar.bz2 linux-3.10-e1cab5a5896e142190cd66a8287099b52e5855a7.zip | |
nfsd4: set cb_client inside setup_callback_client
This is just a minor code simplification.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 049f052a6eb..4788d09d9be 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -366,7 +366,7 @@ static int max_cb_time(void) /* Reference counting, callback cleanup, etc., all look racy as heck. * And why is cb_set an atomic? */ -static struct rpc_clnt *setup_callback_client(struct nfs4_client *clp) +int setup_callback_client(struct nfs4_client *clp) { struct sockaddr_in addr; struct nfs4_callback *cb = &clp->cl_callback; @@ -389,7 +389,7 @@ static struct rpc_clnt *setup_callback_client(struct nfs4_client *clp) struct rpc_clnt *client; if (!clp->cl_principal && (clp->cl_flavor >= RPC_AUTH_GSS_KRB5)) - return ERR_PTR(-EINVAL); + return -EINVAL; /* Initialize address */ memset(&addr, 0, sizeof(addr)); @@ -399,10 +399,13 @@ static struct rpc_clnt *setup_callback_client(struct nfs4_client *clp) /* Create RPC client */ client = rpc_create(&args); - if (IS_ERR(client)) + if (IS_ERR(client)) { dprintk("NFSD: couldn't create callback client: %ld\n", PTR_ERR(client)); - return client; + return PTR_ERR(client); + } + cb->cb_client = client; + return 0; } @@ -414,28 +417,23 @@ static int do_probe_callback(void *data) .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL], .rpc_argp = clp, }; - struct rpc_clnt *client; int status; - client = setup_callback_client(clp); - if (IS_ERR(client)) { - status = PTR_ERR(client); - dprintk("NFSD: couldn't create callback client: %d\n", - status); + status = setup_callback_client(clp); + if (status) goto out_err; - } - status = rpc_call_sync(client, &msg, RPC_TASK_SOFT); + status = rpc_call_sync(cb->cb_client, &msg, RPC_TASK_SOFT); if (status) goto out_release_client; - cb->cb_client = client; atomic_set(&cb->cb_set, 1); put_nfs4_client(clp); return 0; out_release_client: - rpc_shutdown_client(client); + rpc_shutdown_client(cb->cb_client); + cb->cb_client = NULL; out_err: dprintk("NFSD: warning: no callback path to client %.*s: error %d\n", (int)clp->cl_name.len, clp->cl_name.data, status); |