]> err.no Git - linux-2.6/commitdiff
SUNRPC: Don't call xprt_release in call refresh
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 1 Oct 2007 16:06:48 +0000 (12:06 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 9 Oct 2007 21:20:42 +0000 (17:20 -0400)
Call it from call_verify() instead...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
net/sunrpc/clnt.c

index e6a2678ecec3ef5b2ef4fb3232ee5bedcae167de..76be83ee4b04a59f90f99a3afc69ce8889a7ff39 100644 (file)
@@ -1271,7 +1271,6 @@ call_refresh(struct rpc_task *task)
 {
        dprint_status(task);
 
-       xprt_release(task);     /* Must do to obtain new XID */
        task->tk_action = call_refreshresult;
        task->tk_status = 0;
        task->tk_client->cl_stats->rpcauthrefresh++;
@@ -1389,6 +1388,8 @@ call_verify(struct rpc_task *task)
                        dprintk("RPC: %5u %s: retry stale creds\n",
                                        task->tk_pid, __FUNCTION__);
                        rpcauth_invalcred(task);
+                       /* Ensure we obtain a new XID! */
+                       xprt_release(task);
                        task->tk_action = call_refresh;
                        goto out_retry;
                case RPC_AUTH_BADCRED: