From 9da66f8898a69b77121a4f2ae785e9cd29e94e6c Mon Sep 17 00:00:00 2001 From: Yang Bai Date: Tue, 18 Oct 2011 11:53:11 -0400 Subject: [PATCH] mount.nfs: Mount should really return from errno test We should only try next address family if we meet ECONNREFUSED or EHOSTUNREACH for v4 or ECONNREFUSED or EOPNOTSUPP or EHOSTUNREACH for v3v2. Before, only a break in swich can not make the program out of for loop. Signed-off-by: Yang Bai Signed-off-by: Steve Dickson --- utils/mount/stropts.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 314a806..4032bf3 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -665,9 +665,10 @@ static int nfs_try_mount_v3v2(struct nfsmount_info *mi) case EHOSTUNREACH: continue; default: - break; + goto out; } } +out: return ret; } @@ -751,9 +752,10 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi) case EHOSTUNREACH: continue; default: - break; + goto out; } } +out: return ret; } -- 2.39.5