From: Steve Dickson <steved@redhat.com>
Date: Tue, 3 Nov 2009 14:49:03 +0000 (-0500)
Subject: Retry v4 mounts with a v3 mount when the version
X-Git-Tag: nfs-utils-1-2-1~5
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e1eccc5fc317f73801522b3b498c6dab67b048d2;p=nfs-utils.git

Retry v4 mounts with a v3 mount when the version
is not explicitly specified and the mount fails
with ENOENT. The will help deal with Linux servers
that do not automatically export a pseudo root

Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 7b63b45..709f0ff 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -628,8 +628,15 @@ static int nfs_try_mount(struct nfsmount_info *mi)
 		if (linux_version_code() > MAKE_VERSION(2, 6, 31)) {
 			errno = 0;
 			result = nfs_try_mount_v4(mi);
-			if (errno != EPROTONOSUPPORT)
-				break;
+			if (errno != EPROTONOSUPPORT) {
+				/* 
+				 * To deal with legacy Linux servers that don't
+				 * automatically export a pseudo root, retry
+				 * ENOENT errors using version 3
+				 */
+				if (errno != ENOENT)
+					break;
+			}
 		}
 	case 2:
 	case 3: