diff options
author | Karel Zak | 2013-08-21 16:07:51 +0200 |
---|---|---|
committer | Karel Zak | 2013-08-21 16:07:51 +0200 |
commit | 50fccba1ab7097bcb69048bbe929ab739be3fc1e (patch) | |
tree | a0682409c49b721e7dc9e3082fc92b909586f7c2 /misc-utils | |
parent | libmount: add reference counter to libmnt_table (diff) | |
download | kernel-qcow2-util-linux-50fccba1ab7097bcb69048bbe929ab739be3fc1e.tar.gz kernel-qcow2-util-linux-50fccba1ab7097bcb69048bbe929ab739be3fc1e.tar.xz kernel-qcow2-util-linux-50fccba1ab7097bcb69048bbe929ab739be3fc1e.zip |
misc: use libmnt_table reference counter
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils')
-rw-r--r-- | misc-utils/findmnt.c | 7 | ||||
-rw-r--r-- | misc-utils/lsblk.c | 5 | ||||
-rw-r--r-- | misc-utils/lslocks.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index aba7075df..3da901231 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -806,7 +806,7 @@ static struct libmnt_table *parse_tabfiles(char **files, break; } if (rc) { - mnt_free_table(tb); + mnt_unref_table(tb); warn(_("can't read %s"), path); return NULL; } @@ -1087,7 +1087,7 @@ static int poll_table(struct libmnt_table *tb, const char *tabfile, rc = 0; done: - mnt_free_table(tb_new); + mnt_unref_table(tb_new); mnt_free_tabdiff(diff); mnt_free_iter(itr); if (f) @@ -1496,8 +1496,9 @@ int main(int argc, char *argv[]) leave: tt_free_table(tt); - mnt_free_table(tb); + mnt_unref_table(tb); mnt_unref_cache(cache); + free(tabfiles); #ifdef HAVE_LIBUDEV udev_unref(udev); diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index b5cdf6c45..69e769229 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -1604,8 +1604,9 @@ int main(int argc, char *argv[]) leave: tt_free_table(lsblk->tt); - mnt_free_table(mtab); - mnt_free_table(swaps); + + mnt_unref_table(mtab); + mnt_unref_table(swaps); mnt_unref_cache(mntcache); #ifdef HAVE_LIBUDEV udev_unref(udev); diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c index de3094a01..c2ad18dd1 100644 --- a/misc-utils/lslocks.c +++ b/misc-utils/lslocks.c @@ -592,6 +592,6 @@ int main(int argc, char *argv[]) if (!rc && !list_empty(&locks)) rc = show_locks(&locks, tt_flags); - mnt_free_table(tab); + mnt_unref_table(tab); return rc; } |