Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <39888986-ccfe-0dfb-6429-ad7aceb4575a@redhat.com>
Date:   Wed, 23 Feb 2022 11:48:03 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Subject: Re: [PATCH] mount.nfs: Fix Typo auto negotiating code.
Content-Language: en-US
From:   Steve Dickson <steved@redhat.com>
To:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>
References: <20220219164631.38534-1-steved@redhat.com>
In-Reply-To: <20220219164631.38534-1-steved@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 2/19/22 11:46 AM, Steve Dickson wrote:
> Commit 14258541 add a check that had a '||'
> instead of a '&&' which is the typo.
> 
> The intention of commit 14258541 was to show
> EBUSY errors but this error is not shown when
> the mount point does exists (commit afda50fc).
> 
> In the end, EBUSY are now interrupted correctly
> in this corner case.
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... (tag: nfs-utils-2-6-2-rc2)

steved.
> ---
>   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 573df6e..dbdd11e 100644
> --- a/utils/mount/stropts.c
> +++ b/utils/mount/stropts.c
> @@ -973,7 +973,7 @@ fall_back:
>   	if ((result = nfs_try_mount_v3v2(mi, FALSE)))
>   		return result;
>   
> -	if (errno != EBUSY || errno != EACCES)
> +	if (errno != EBUSY && errno != EACCES)
>   		errno = olderrno;
>   
>   	return result;