From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Nov 2012 15:50:02 +0000 (+0100)
Subject: umount: allways return MOUNT_EX_*
X-Git-Tag: v2.23-rc1~527
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06069d5f636d68736a2bd7ab406efd9645a40cac;p=thirdparty%2Futil-linux.git

umount: allways return MOUNT_EX_*

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 196a511ba6..b0031026d6 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -260,7 +260,7 @@ static int umount_all(struct libmnt_context *cxt)
 	itr = mnt_new_iter(MNT_ITER_BACKWARD);
 	if (!itr) {
 		warn(_("failed to initialize libmount iterator"));
-		return -ENOMEM;
+		return MOUNT_EX_SYSERR;
 	}
 
 	while (mnt_context_next_umount(cxt, itr, &fs, &mntrc, &ignored) == 0) {
@@ -287,7 +287,7 @@ static int umount_one(struct libmnt_context *cxt, const char *spec)
 	int rc;
 
 	if (!spec)
-		return -EINVAL;
+		return MOUNT_EX_SOFTWARE;
 
 	if (mnt_context_set_target(cxt, spec))
 		err(MOUNT_EX_SYSERR, _("failed to set umount target"));