From 2ce8bff527b559cb0257042c99f4e51efb877132 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 8 Mar 2018 20:35:22 -0600 Subject: [PATCH] xfsprogs: call libxfs_destroy from other utilities Call libxfs_destroy() from xfs_copy, xfs_db, mkfs.xfs, and xfs_repair to allow us to detect leaked items in these utilities as well. Signed-off-by: Eric Sandeen Reviewed-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- copy/xfs_copy.c | 1 + db/init.c | 2 ++ mkfs/xfs_mkfs.c | 1 + repair/xfs_repair.c | 1 + 4 files changed, 5 insertions(+) diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index 16ee4d9c5..0b80613f4 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -1215,6 +1215,7 @@ main(int argc, char **argv) check_errors(); libxfs_umount(mp); + libxfs_destroy(); return 0; } diff --git a/db/init.c b/db/init.c index b108a06cf..29fc344c6 100644 --- a/db/init.c +++ b/db/init.c @@ -236,5 +236,7 @@ close_devices: libxfs_device_close(x.logdev); if (x.rtdev) libxfs_device_close(x.rtdev); + libxfs_destroy(); + return exitcode; } diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index f973b6bc1..1ca6a2d14 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -4045,6 +4045,7 @@ main( if (xi.logdev && xi.logdev != xi.ddev) libxfs_device_close(xi.logdev); libxfs_device_close(xi.ddev); + libxfs_destroy(); return 0; } diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c index b2dd91b52..312a0d086 100644 --- a/repair/xfs_repair.c +++ b/repair/xfs_repair.c @@ -1082,6 +1082,7 @@ _("Note - stripe unit (%d) and width (%d) were copied from a backup superblock.\ if (x.logdev && x.logdev != x.ddev) libxfs_device_close(x.logdev); libxfs_device_close(x.ddev); + libxfs_destroy(); if (verbose) summary_report(); -- 2.47.2