From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 27 Jun 2010 14:47:40 +0000 (+0200)
Subject: mount: fix a case when sometimes error message is not printed
X-Git-Tag: 1_17_0~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa1b3705a336f2ff4b6b841e12ae1edaba742d18;p=oweals%2Fbusybox.git

mount: fix a case when sometimes error message is not printed

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/util-linux/mount.c b/util-linux/mount.c
index aed6f798b..9107e4308 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1718,9 +1718,9 @@ static int singlemount(struct mntent *mp, int ignore_busy)
 
 	// If we know the fstype (or don't need to), jump straight
 	// to the actual mount.
-	if (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE)))
+	if (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
 		rc = mount_it_now(mp, vfsflags, filteropts);
-	else {
+	} else {
 		// Loop through filesystem types until mount succeeds
 		// or we run out
 
@@ -1756,7 +1756,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
 
 	if (errno == EBUSY && ignore_busy)
 		return 0;
-	if (rc < 0)
+	if (rc != 0)
 		bb_perror_msg("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir);
 	return rc;
 }