aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2018-03-08 20:35:22 -0600
committerEric Sandeen <sandeen@redhat.com>2018-03-08 20:35:22 -0600
commit2ce8bff527b559cb0257042c99f4e51efb877132 (patch)
tree392eb40df725c0c07c3f1163626dd35773efbffb
parent444884913bd52a843eb49a757e6e65681ab2e90b (diff)
downloadxfsprogs-dev-2ce8bff527b559cb0257042c99f4e51efb877132.tar.gz
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 <sandeen@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r--copy/xfs_copy.c1
-rw-r--r--db/init.c2
-rw-r--r--mkfs/xfs_mkfs.c1
-rw-r--r--repair/xfs_repair.c1
4 files changed, 5 insertions, 0 deletions
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 16ee4d9c51..0b80613f4e 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 b108a06cfe..29fc344c6a 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 f973b6bc15..1ca6a2d148 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 b2dd91b525..312a0d0869 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();