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 4e1e3287bccff4c1090bf5e96ee982d80dcf60b5..48f68dfc9f7eedc0260ce90df85ea8e6a7eadc98 100644 (file)
--- 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 de31f38329a00d4eef21f4a53eff364c2a497519..4a2e265eea754442b1cdee72f104f2c7bb8fd7ba 100644 (file)
--- 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 0ab7c599582d459989f42e4dacb2987417e01603..abcf96f20939a3fe4580424fcc6c29dad875ff6f 100644 (file)
--- 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 */