nfsv3: Make v3 mounts fail with ETIMEDOUTs instead EIO on mountd timeouts

In very busy v3 environment, rpc.mountd can respond to the NULL
procedure but not the MNT procedure in a timely manner causing
the MNT procedure to time out. The problem is the mount system
call returns EIO which causes the mount to fail, instead of
ETIMEDOUT, which would cause the mount to be retried.

This patch sets the RPC_TASK_SOFT|RPC_TASK_TIMEOUT flags to
the rpc_call_sync() call in nfs_mount() which causes
ETIMEDOUT to be returned on timed out connections.

Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Scott Mayhew 2012-10-16 13:22:19 -04:00 committed by Trond Myklebust
parent 7175fe9015
commit acce94e68a
1 changed files with 1 additions and 1 deletions

View File

@ -181,7 +181,7 @@ int nfs_mount(struct nfs_mount_request *info)
else else
msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT]; msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT];
status = rpc_call_sync(mnt_clnt, &msg, 0); status = rpc_call_sync(mnt_clnt, &msg, RPC_TASK_SOFT|RPC_TASK_TIMEOUT);
rpc_shutdown_client(mnt_clnt); rpc_shutdown_client(mnt_clnt);
if (status < 0) if (status < 0)