From: Karel Zak <kzak@redhat.com>
Date: Wed, 28 Mar 2012 12:24:57 +0000 (+0200)
Subject: eject: call umount <mountpoint> rather than <device>
X-Git-Tag: v2.22-rc1~555^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c30aa8b974e71270fad54f8117be612b6e83e0;p=thirdparty%2Futil-linux.git

eject: call umount <mountpoint> rather than <device>

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

diff --git a/misc-utils/eject.c b/misc-utils/eject.c
index 2fd47c3ac0..c814894268 100644
--- a/misc-utils/eject.c
+++ b/misc-utils/eject.c
@@ -605,8 +605,8 @@ static int eject_tape(int fd)
 }
 
 
-/* Unmount a device. */
-static void unmount_one(const char *name)
+/* umount a device. */
+static void umount_one(const char *name)
 {
 	int status;
 
@@ -729,7 +729,7 @@ static void unmount_devices(const char *pattern)
 			status = regexec(&preg, s1, 0, 0, 0);
 			if (status == 0) {
 				verbose(_("%s: unmounting"), s1);
-				unmount_one(s1);
+				umount_one(s1);
 				regfree(&preg);
 			}
 		}
@@ -903,7 +903,7 @@ int main(int argc, char **argv)
 	/* unmount device if mounted */
 	if ((m_option != 1) && mounted) {
 		verbose(_("%s: unmounting"), device);
-		unmount_one(device);
+		umount_one(mountpoint);
 	}
 
 	/* if it is a multipartition device, unmount any other partitions on