summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2022-02-22 15:59:46 -0500
committerSteve Dickson <steved@redhat.com>2022-02-22 15:59:46 -0500
commit8a8b127d29e38200f244a8b5ad0c7c7769c40402 (patch)
treec9b99fe6d9e9ced069ca692cd8d4a13bad44e5de /utils
parentc547ad481dca5bc0b0a2e365ebcff3439848f664 (diff)
downloadnfs-utils-8a8b127d29e38200f244a8b5ad0c7c7769c40402.tar.gz
mount.nfs: Fix Typo auto negotiating code.
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> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/mount/stropts.c2
1 files changed, 1 insertions, 1 deletions
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;