From cf73923358c47238088cbdd0bffdf1b7a4b7d0e7 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 6 Dec 2016 10:42:22 -0500 Subject: mount: don't hide temporary error code on timeout. If a mount attempt times out due to repeated non-permanent errors, we always report ETIMEDOUT rather than the actual error. Errors like "ECONNREFUSED" or "EHOSTUNREACH" or "ESTALE" might be more useful than the generic "ETIMEDOUT". So preserve the error code. Signed-off-by: NeilBrown Signed-off-by: Steve Dickson --- utils/mount/stropts.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index d5dfb5e..7b1ad93 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -990,10 +990,8 @@ static int nfsmount_fg(struct nfsmount_info *mi) if (nfs_is_permanent_error(errno)) break; - if (time(NULL) > timeout) { - errno = ETIMEDOUT; + if (time(NULL) > timeout) break; - } if (errno != ETIMEDOUT) { if (sleep(secs)) -- cgit