klibc-bot for Ben Hutchings
2019-Oct-07 18:21 UTC
[klibc] [klibc:master] nfsmount: Use kernel client's default value for timeo option
Commit-ID: 886783e7a10fb7a638bc6034e4cdcb6296cea6a1 Gitweb: http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=886783e7a10fb7a638bc6034e4cdcb6296cea6a1 Author: Ben Hutchings <ben at decadent.org.uk> AuthorDate: Mon, 7 Oct 2019 17:18:41 +0100 Committer: Ben Hutchings <ben at decadent.org.uk> CommitDate: Mon, 7 Oct 2019 17:27:49 +0100 [klibc] nfsmount: Use kernel client's default value for timeo option The current default of timeo=7 (0.7 seconds) is too short, especially on slow networks. We should not override the kernel client's default unless explicitly requested. This option is passed to the kernel through struct nfs_mount_data rather than as a string, so we have to provide some value. The kernel client currently treats either 0 or UINT_MAX as requesting the default. nfs-utils passes 0, so do the same here. Reported-by: Alkis Georgopoulos <alkisg at gmail.com> References: https://lists.zytor.com/archives/klibc/2019-September/004233.html Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- usr/kinit/nfsmount/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/kinit/nfsmount/main.c b/usr/kinit/nfsmount/main.c index cca9e4ec..66969f42 100644 --- a/usr/kinit/nfsmount/main.c +++ b/usr/kinit/nfsmount/main.c @@ -26,7 +26,7 @@ static struct nfs_mount_data mount_data = { .flags = NFS_MOUNT_NONLM | NFS_MOUNT_VER3 | NFS_MOUNT_TCP, .rsize = 0, /* Server's choice */ .wsize = 0, /* Server's choice */ - .timeo = 7, + .timeo = 0, /* Kernel client's default */ .retrans = 3, .acregmin = 3, .acregmax = 60,