From 0277815d9509ffc197c27973313f364616245704 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Thu, 4 May 2017 09:50:49 -0400 Subject: mount.nfs: Restore errno after v3 mounts on ECONNREFUSED errors Commit 65ac59cd introduced code that tries v3 mounts when the the v4 mount fails with ECONNREFUSED. This code allows failing back to v3 to work correctly. When the v3 mount fails the original errno value has been over rewritten. In these case the errno value needs to be restored to ECONNREFUSED. Signed-off-by: Steve Dickson --- utils/mount/stropts.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index a9ff95d..0fbb375 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -868,7 +868,10 @@ check_result: result = nfs_try_mount_v4(mi); if (result == 0 && errno != ECONNREFUSED) goto check_result; - } + } else if (result == 0) + /* Restore original errno with v3 failures */ + errno = ECONNREFUSED; + return result; default: return result; -- cgit