[PATCH] Retry NFSv3 mount after NFSv4 failure in auto negotiation

[PATCH] Retry NFSv3 mount after NFSv4 failure in auto negotiation

[Seiichi Ikarashi (Fujitsu)]

The problem happens when a v3 mount fails with ETIMEDOUT after
the v4 mount failed with EPROTONOSUPPORT, in mount auto negotiation.
It immediately breaks from the "for" loop in nfsmount_fg()
or nfsmount_child() due to EPROTONOSUPPORT, never doing the expected
retries until timeout.

Let's retry in v3, too.

Signed-off-by: Seiichi Ikarashi <s.ikarashi@fujitsu.com>
---
 utils/mount/stropts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index a92c420..103c41f 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -981,7 +981,7 @@ fall_back:
        if ((result = nfs_try_mount_v3v2(mi, FALSE)))
                return result;
 
-       if (errno != EBUSY && errno != EACCES)
+       if (errno != EBUSY && errno != EACCES && errno != ETIMEDOUT)
                errno = olderrno;
 
        return result;

Re: [PATCH] Retry NFSv3 mount after NFSv4 failure in auto negotiation

[Scott Mayhew]

On Fri, 18 Oct 2024, Seiichi Ikarashi (Fujitsu) wrote:

> The problem happens when a v3 mount fails with ETIMEDOUT after
> the v4 mount failed with EPROTONOSUPPORT, in mount auto negotiation.
> It immediately breaks from the "for" loop in nfsmount_fg()
> or nfsmount_child() due to EPROTONOSUPPORT, never doing the expected
> retries until timeout.
> 
> Let's retry in v3, too.
> 
> Signed-off-by: Seiichi Ikarashi <s.ikarashi@fujitsu.com>
> ---
>  utils/mount/stropts.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
> index a92c420..103c41f 100644
> --- a/utils/mount/stropts.c
> +++ b/utils/mount/stropts.c
> @@ -981,7 +981,7 @@ fall_back:
>         if ((result = nfs_try_mount_v3v2(mi, FALSE)))
>                 return result;
>  
> -       if (errno != EBUSY && errno != EACCES)
> +       if (errno != EBUSY && errno != EACCES && errno != ETIMEDOUT)
>                 errno = olderrno;
>  
>         return result;
> 
This change looks good to me, but the patch itself doesn't apply (it has
spaces instead of tabs).

-Scott