From: Karel Zak <kzak@redhat.com>
Date: Fri, 12 Feb 2016 10:03:32 +0000 (+0100)
Subject: libmount: fix mnt_table_is_fs_mounted() for loopdev
X-Git-Tag: v2.28-rc1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d58b9706ed8a10cc484835119ed10385d141eb6c;p=thirdparty%2Futil-linux.git

libmount: fix mnt_table_is_fs_mounted() for loopdev

Reported-by: Stanislav Brabec <sbrabec@suse.cz>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index cb31de927c..729a99fc08 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -1485,8 +1485,9 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
 	int rc = 0;
 	dev_t devno = 0;
 
-	DBG(FS, ul_debugobj(fstab_fs, "is FS mounted? [target=%s]",
-				mnt_fs_get_target(fstab_fs)));
+	DBG(FS, ul_debugobj(fstab_fs, "is FS mounted? [target=%s, source=%s]",
+				mnt_fs_get_target(fstab_fs),
+				mnt_fs_get_source(fstab_fs)));
 
 	if (mnt_fs_is_swaparea(fstab_fs) || mnt_table_is_empty(tb)) {
 		DBG(FS, ul_debugobj(fstab_fs, "- ignore (swap or no data)"));
@@ -1558,9 +1559,12 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs)
 			} else
 				flags = LOOPDEV_FL_OFFSET;
 
+			DBG(FS, ul_debugobj(fs, "checking for loop: src=%s", mnt_fs_get_srcpath(fs)));
 #if __linux__
-			if (loopdev_is_used(mnt_fs_get_srcpath(fs), src, offset, flags))
-				break;
+			if (!loopdev_is_used(mnt_fs_get_srcpath(fs), src, offset, flags))
+				continue;
+
+			DBG(FS, ul_debugobj(fs, "used loop"));
 #endif
 		}