diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 14:32:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 14:32:15 -0700 |
commit | 9092131f7ea2f9e92a510ae13ac4d20165aa921c (patch) | |
tree | 4bcac80a227d320b69454057cdcef41ef43c6c85 /fs/nfsd/nfs4callback.c | |
parent | f1b04770b0d073a9d70e5b3b873d274c1c19e1f6 (diff) | |
parent | eadf4598e7ec37a234e70e965bd335860e58bda4 (diff) |
Merge rsync://client.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
-rw-r--r-- | fs/nfsd/nfs4callback.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 1a55dfcb74bc..634465e9cfc6 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -430,7 +430,7 @@ nfsd4_probe_callback(struct nfs4_client *clp) clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX); if (IS_ERR(clnt)) { dprintk("NFSD: couldn't create callback client\n"); - goto out_xprt; + goto out_err; } clnt->cl_intr = 0; clnt->cl_softrtry = 1; @@ -465,8 +465,6 @@ out_rpciod: out_clnt: rpc_shutdown_client(clnt); goto out_err; -out_xprt: - xprt_destroy(xprt); out_err: dprintk("NFSD: warning: no callback path to client %.*s\n", (int)clp->cl_name.len, clp->cl_name.data); |