]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
mount.nfs: Mount should really return from errno test nfs-utils-1-2-6-rc2
authorYang Bai <hamo.by@gmail.com>
Tue, 18 Oct 2011 15:53:11 +0000 (11:53 -0400)
committerSteve Dickson <steved@redhat.com>
Tue, 18 Oct 2011 15:53:11 +0000 (11:53 -0400)
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 <hamo.by@gmail.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
utils/mount/stropts.c

index 314a806799bbe83ed8e805b94059726f152bb898..4032bf3e7aed502616a8b76c1e4ef79d193fc36f 100644 (file)
@@ -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;
 }