2018-10-25 15:33:05

by Steve Dickson

[permalink] [raw]
Subject: [PATCH] mount.nfs: Add braces around EBUSY code

Signed-off-by: Steve Dickson <[email protected]>
---
utils/mount/stropts.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index eed0356..0a25b1f 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -1080,7 +1080,7 @@ static int nfsmount_fg(struct nfsmount_info *mi)
return EX_SUCCESS;

#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
- if (errno == EBUSY && is_mountpoint(mi->node))
+ if (errno == EBUSY && is_mountpoint(mi->node)) {
#pragma GCC diagnostic warning "-Wdiscarded-qualifiers"
/*
* EBUSY can happen when mounting a filesystem that
@@ -1090,6 +1090,7 @@ static int nfsmount_fg(struct nfsmount_info *mi)
* Only error out in the latter case.
*/
return EX_SUCCESS;
+ }

if (nfs_is_permanent_error(errno))
break;
--
2.17.2