From: Karel Zak <kzak@redhat.com>
Date: Fri, 14 Sep 2018 13:45:53 +0000 (+0200)
Subject: lsblk: init/deinit libmount stuff
X-Git-Tag: v2.33-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0c016f11b78b12b0b47d5623b2fccfeeca2d838;p=thirdparty%2Futil-linux.git

lsblk: init/deinit libmount stuff

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

diff --git a/misc-utils/lsblk-mnt.c b/misc-utils/lsblk-mnt.c
index 4e1e3287bc..48f68dfc9f 100644
--- a/misc-utils/lsblk-mnt.c
+++ b/misc-utils/lsblk-mnt.c
@@ -109,3 +109,15 @@ char *get_device_mountpoint(struct blkdev_cxt *cxt)
 	cxt->is_mounted = 1;
 	return cxt->mountpoint;
 }
+
+void lsblk_mnt_init(void)
+{
+	mnt_init_debug(0);
+}
+
+void lsblk_mnt_deinit(void)
+{
+	mnt_unref_table(mtab);
+	mnt_unref_table(swaps);
+	mnt_unref_cache(mntcache);
+}
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index de31f38329..4a2e265eea 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1867,6 +1867,7 @@ int main(int argc, char *argv[])
 		lsblk->sort_hidden = 1;
 	}
 
+	lsblk_mnt_init();
 	scols_init_debug(0);
 	ul_path_init_debug();
 
@@ -1958,5 +1959,6 @@ leave:
 #ifdef HAVE_LIBUDEV
 	udev_unref(udev);
 #endif
+	lsblk_mnt_deinit();
 	return status;
 }
diff --git a/misc-utils/lsblk.h b/misc-utils/lsblk.h
index 0ab7c59958..abcf96f209 100644
--- a/misc-utils/lsblk.h
+++ b/misc-utils/lsblk.h
@@ -92,6 +92,10 @@ struct blkdev_cxt {
 	unsigned int	is_mounted : 1;
 };
 
+
+extern void lsblk_mnt_init(void);
+extern void lsblk_mnt_deinit(void);
+
 extern char *get_device_mountpoint(struct blkdev_cxt *cxt);
 
 #endif /* UTIL_LINUX_LSBLK_H */