aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-27 16:47:40 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-06-27 16:47:40 +0200
commitfa1b3705a336f2ff4b6b841e12ae1edaba742d18 (patch)
tree034fb179cf3cef0dbee98b7deb96885621ea2b89
parent77cc2c5738d780b97b56af49510ed64d61ad2e2d (diff)
downloadbusybox-w32-fa1b3705a336f2ff4b6b841e12ae1edaba742d18.tar.gz
busybox-w32-fa1b3705a336f2ff4b6b841e12ae1edaba742d18.tar.bz2
busybox-w32-fa1b3705a336f2ff4b6b841e12ae1edaba742d18.zip
mount: fix a case when sometimes error message is not printed
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/mount.c6
1 files changed, 3 insertions, 3 deletions
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)
1718 1718
1719 // If we know the fstype (or don't need to), jump straight 1719 // If we know the fstype (or don't need to), jump straight
1720 // to the actual mount. 1720 // to the actual mount.
1721 if (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) 1721 if (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
1722 rc = mount_it_now(mp, vfsflags, filteropts); 1722 rc = mount_it_now(mp, vfsflags, filteropts);
1723 else { 1723 } else {
1724 // Loop through filesystem types until mount succeeds 1724 // Loop through filesystem types until mount succeeds
1725 // or we run out 1725 // or we run out
1726 1726
@@ -1756,7 +1756,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
1756 1756
1757 if (errno == EBUSY && ignore_busy) 1757 if (errno == EBUSY && ignore_busy)
1758 return 0; 1758 return 0;
1759 if (rc < 0) 1759 if (rc != 0)
1760 bb_perror_msg("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir); 1760 bb_perror_msg("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir);
1761 return rc; 1761 return rc;
1762} 1762}