From e4dc1e23947937a11f5144df50893e6ce29d8574 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 7 Jul 2008 12:18:52 -0400
Subject: [PATCH] --- yaml --- r: 98787 b: refs/heads/master c:
 0d3a34b48c87a374b37d7a21a60d257d076484f3 h: refs/heads/master i:   98785:
 aa20f081b7aa5a48fa9ef42d12bed021345497f5   98783:
 8e5cad9091f73f95785fd54368411d63cbfec99a v: v3

---
 [refs]                       | 2 +-
 trunk/net/sunrpc/rpcb_clnt.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8360d746127f..e2029c3a5edb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aac05a91971fbd1bf6cbed78b8731eb7454b9b7
+refs/heads/master: 0d3a34b48c87a374b37d7a21a60d257d076484f3
diff --git a/trunk/net/sunrpc/rpcb_clnt.c b/trunk/net/sunrpc/rpcb_clnt.c
index 0517967a68bf..21c698d7b774 100644
--- a/trunk/net/sunrpc/rpcb_clnt.c
+++ b/trunk/net/sunrpc/rpcb_clnt.c
@@ -365,18 +365,16 @@ void rpcb_getport_async(struct rpc_task *task)
 	rpc_release_client(rpcb_clnt);
 	if (IS_ERR(child)) {
 		status = -EIO;
+		/* rpcb_map_release() has freed the arguments */
 		dprintk("RPC: %5u %s: rpc_run_task failed\n",
 			task->tk_pid, __func__);
-		goto bailout;
+		goto bailout_nofree;
 	}
 	rpc_put_task(child);
 
 	task->tk_xprt->stat.bind_count++;
 	return;
 
-bailout:
-	kfree(map);
-	xprt_put(xprt);
 bailout_nofree:
 	rpcb_wake_rpcbind_waiters(xprt, status);
 bailout_nowake: