diff options
author | Karel Zak | 2018-09-14 15:45:53 +0200 |
---|---|---|
committer | Karel Zak | 2018-09-14 15:45:53 +0200 |
commit | e0c016f11b78b12b0b47d5623b2fccfeeca2d838 (patch) | |
tree | ad53ef7aee52e3412f16c7e8e1dc4edd871ec1f0 /misc-utils | |
parent | lsblk: move mount stuff to lsblk-mnt.c (diff) | |
download | kernel-qcow2-util-linux-e0c016f11b78b12b0b47d5623b2fccfeeca2d838.tar.gz kernel-qcow2-util-linux-e0c016f11b78b12b0b47d5623b2fccfeeca2d838.tar.xz kernel-qcow2-util-linux-e0c016f11b78b12b0b47d5623b2fccfeeca2d838.zip |
lsblk: init/deinit libmount stuff
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils')
-rw-r--r-- | misc-utils/lsblk-mnt.c | 12 | ||||
-rw-r--r-- | misc-utils/lsblk.c | 2 | ||||
-rw-r--r-- | misc-utils/lsblk.h | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/misc-utils/lsblk-mnt.c b/misc-utils/lsblk-mnt.c index 4e1e3287b..48f68dfc9 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 de31f3832..4a2e265ee 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 0ab7c5995..abcf96f20 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 */ |