aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-01 12:06:48 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:20:42 -0400
commit220bcc2afd7011b3e0569fc178331fa983c92c1b (patch)
tree2a9d18da02292c6c6d7b8da7f6dd6a209ea1b57d
parentb6e9c713f5c526a85893c6e0ab1d5d6c6f1ab479 (diff)
SUNRPC: Don't call xprt_release in call refresh
Call it from call_verify() instead... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--net/sunrpc/clnt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index e6a2678ecec3..76be83ee4b04 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1271,7 +1271,6 @@ call_refresh(struct rpc_task *task)
1271{ 1271{
1272 dprint_status(task); 1272 dprint_status(task);
1273 1273
1274 xprt_release(task); /* Must do to obtain new XID */
1275 task->tk_action = call_refreshresult; 1274 task->tk_action = call_refreshresult;
1276 task->tk_status = 0; 1275 task->tk_status = 0;
1277 task->tk_client->cl_stats->rpcauthrefresh++; 1276 task->tk_client->cl_stats->rpcauthrefresh++;
@@ -1389,6 +1388,8 @@ call_verify(struct rpc_task *task)
1389 dprintk("RPC: %5u %s: retry stale creds\n", 1388 dprintk("RPC: %5u %s: retry stale creds\n",
1390 task->tk_pid, __FUNCTION__); 1389 task->tk_pid, __FUNCTION__);
1391 rpcauth_invalcred(task); 1390 rpcauth_invalcred(task);
1391 /* Ensure we obtain a new XID! */
1392 xprt_release(task);
1392 task->tk_action = call_refresh; 1393 task->tk_action = call_refresh;
1393 goto out_retry; 1394 goto out_retry;
1394 case RPC_AUTH_BADCRED: 1395 case RPC_AUTH_BADCRED: