diff options
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r-- | net/sunrpc/clnt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index ceadb728f0da..084a0ad5c64e 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -177,7 +177,7 @@ out_no_path: | |||
177 | kfree(clnt->cl_server); | 177 | kfree(clnt->cl_server); |
178 | kfree(clnt); | 178 | kfree(clnt); |
179 | out_err: | 179 | out_err: |
180 | xprt_destroy(xprt); | 180 | xprt_put(xprt); |
181 | out_no_xprt: | 181 | out_no_xprt: |
182 | return ERR_PTR(err); | 182 | return ERR_PTR(err); |
183 | } | 183 | } |
@@ -261,6 +261,7 @@ rpc_clone_client(struct rpc_clnt *clnt) | |||
261 | atomic_set(&new->cl_users, 0); | 261 | atomic_set(&new->cl_users, 0); |
262 | new->cl_parent = clnt; | 262 | new->cl_parent = clnt; |
263 | atomic_inc(&clnt->cl_count); | 263 | atomic_inc(&clnt->cl_count); |
264 | new->cl_xprt = xprt_get(clnt->cl_xprt); | ||
264 | /* Turn off autobind on clones */ | 265 | /* Turn off autobind on clones */ |
265 | new->cl_autobind = 0; | 266 | new->cl_autobind = 0; |
266 | new->cl_oneshot = 0; | 267 | new->cl_oneshot = 0; |
@@ -337,15 +338,12 @@ rpc_destroy_client(struct rpc_clnt *clnt) | |||
337 | rpc_rmdir(clnt->cl_dentry); | 338 | rpc_rmdir(clnt->cl_dentry); |
338 | rpc_put_mount(); | 339 | rpc_put_mount(); |
339 | } | 340 | } |
340 | if (clnt->cl_xprt) { | ||
341 | xprt_destroy(clnt->cl_xprt); | ||
342 | clnt->cl_xprt = NULL; | ||
343 | } | ||
344 | if (clnt->cl_server != clnt->cl_inline_name) | 341 | if (clnt->cl_server != clnt->cl_inline_name) |
345 | kfree(clnt->cl_server); | 342 | kfree(clnt->cl_server); |
346 | out_free: | 343 | out_free: |
347 | rpc_free_iostats(clnt->cl_metrics); | 344 | rpc_free_iostats(clnt->cl_metrics); |
348 | clnt->cl_metrics = NULL; | 345 | clnt->cl_metrics = NULL; |
346 | xprt_put(clnt->cl_xprt); | ||
349 | kfree(clnt); | 347 | kfree(clnt); |
350 | return 0; | 348 | return 0; |
351 | } | 349 | } |