mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
[PATCH] RPC: Report connection errors properly when mounting with "soft"
Fix up xprt_connect_status: the soft timeout logic was clobbering tk_status, so TCP connect errors were not properly reported on soft mounts. Test-plan: Destructive testing (unplugging the network temporarily). Connectathon with UDP and TCP. Version: Thu, 11 Aug 2005 16:01:28 -0400 Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
9aa48b7e27
commit
23475d66bd
1 changed files with 18 additions and 9 deletions
|
@ -592,24 +592,33 @@ xprt_connect_status(struct rpc_task *task)
|
|||
return;
|
||||
}
|
||||
|
||||
/* if soft mounted, just cause this RPC to fail */
|
||||
if (RPC_IS_SOFT(task))
|
||||
task->tk_status = -EIO;
|
||||
|
||||
switch (task->tk_status) {
|
||||
case -ECONNREFUSED:
|
||||
case -ECONNRESET:
|
||||
dprintk("RPC: %4d xprt_connect_status: server %s refused connection\n",
|
||||
task->tk_pid, task->tk_client->cl_server);
|
||||
break;
|
||||
case -ENOTCONN:
|
||||
return;
|
||||
dprintk("RPC: %4d xprt_connect_status: connection broken\n",
|
||||
task->tk_pid);
|
||||
break;
|
||||
case -ETIMEDOUT:
|
||||
dprintk("RPC: %4d xprt_connect_status: timed out\n",
|
||||
dprintk("RPC: %4d xprt_connect_status: connect attempt timed out\n",
|
||||
task->tk_pid);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "RPC: error %d connecting to server %s\n",
|
||||
-task->tk_status, task->tk_client->cl_server);
|
||||
dprintk("RPC: %4d xprt_connect_status: error %d connecting to server %s\n",
|
||||
task->tk_pid, -task->tk_status, task->tk_client->cl_server);
|
||||
xprt_release_write(xprt, task);
|
||||
task->tk_status = -EIO;
|
||||
return;
|
||||
}
|
||||
|
||||
/* if soft mounted, just cause this RPC to fail */
|
||||
if (RPC_IS_SOFT(task)) {
|
||||
xprt_release_write(xprt, task);
|
||||
task->tk_status = -EIO;
|
||||
}
|
||||
xprt_release_write(xprt, task);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue