From: Karel Zak <kzak@redhat.com>
Date: Thu, 15 Nov 2012 14:59:59 +0000 (+0100)
Subject: libmount: don't try to play with loopdevs if umount argument is really mountpoint
X-Git-Tag: v2.23-rc1~520
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=224f5b92ac25208e41d342bd3bb082a056ae4d70;p=thirdparty%2Futil-linux.git

libmount: don't try to play with loopdevs if umount argument is really mountpoint

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

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 2c2e64c614..a31402cd97 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -112,7 +112,10 @@ static int lookup_umount_fs(struct libmnt_context *cxt)
 try_loopdev:
 	fs = mnt_table_find_target(mtab, tgt, MNT_ITER_BACKWARD);
 	if (!fs && mnt_context_is_swapmatch(cxt)) {
-		/* maybe the option is source rather than target (mountpoint) */
+		/*
+		 * Maybe the option is source rather than target (sometimes
+		 * people use e.g. "umount /dev/sda1")
+		 */
 		fs = mnt_table_find_source(mtab, tgt, MNT_ITER_BACKWARD);
 
 		if (fs) {
@@ -135,9 +138,9 @@ try_loopdev:
 		}
 	}
 
-	if (!fs && !loopdev) {
+	if (!fs && !loopdev && mnt_context_is_swapmatch(cxt)) {
 		/*
-		 * Maybe target is /path/file.img, try to convert to /dev/loopN
+		 * Maybe the option is /path/file.img, try to convert to /dev/loopN
 		 */
 		struct stat st;