From: Karel Zak <kzak@redhat.com>
Date: Fri, 8 Jan 2021 11:00:59 +0000 (+0100)
Subject: libmount: mark entries from /proc/swaps by MNT_FS_SWAP
X-Git-Tag: v2.37-rc1~196
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f19295ad125d03a6bcc31d610de1df79a5a4b04e;p=thirdparty%2Futil-linux.git

libmount: mark entries from /proc/swaps by MNT_FS_SWAP

The function mnt_fs_is_swaparea() does not return TRUE for entries
from /proc/swaps. This is pretty strange.

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

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index ac12dce54a..95585b5b78 100644
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -723,7 +723,9 @@ int mnt_table_parse_stream(struct libmnt_table *tb, FILE *f, const char *filenam
 	/* necessary for /proc/mounts only, the /proc/self/mountinfo
 	 * parser sets the flag properly
 	 */
-	if (filename && strcmp(filename, _PATH_PROC_MOUNTS) == 0)
+	if (tb->fmt == MNT_FMT_SWAPS)
+		flags = MNT_FS_SWAP;
+	else if (filename && strcmp(filename, _PATH_PROC_MOUNTS) == 0)
 		flags = MNT_FS_KERNEL;
 
 	do {