kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] RPC: Report connection errors properly when mounting with "soft"

Browse source 
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:
Chuck Lever 2005-08-11 16:25:08 -04:00 committed by Trond Myklebust
parent 9aa48b7e27
commit 23475d66bd
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
net/sunrpc/xprt.c
View file

@ -592,24 +592,33 @@ xprt_connect_status(struct rpc_task *task)
return; return;
} }
/* if soft mounted, just cause this RPC to fail */
if (RPC_IS_SOFT(task))
task->tk_status = -EIO;
switch (task->tk_status) { switch (task->tk_status) {
case -ECONNREFUSED: case -ECONNREFUSED:
case -ECONNRESET: case -ECONNRESET:
dprintk("RPC: %4d xprt_connect_status: server %s refused connection\n",
task->tk_pid, task->tk_client->cl_server);
break;
case -ENOTCONN: case -ENOTCONN:
return; dprintk("RPC: %4d xprt_connect_status: connection broken\n",
task->tk_pid);
break;
case -ETIMEDOUT: 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); task->tk_pid);
break; break;
default: default:
printk(KERN_ERR "RPC: error %d connecting to server %s\n", dprintk("RPC: %4d xprt_connect_status: error %d connecting to server %s\n",
-task->tk_status, task->tk_client->cl_server); 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);
} }
/* /*