| Message ID | a2564908-f093-19ca-94e3-fab9bfaa88b5@sandeen.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Mar 06, 2018 at 03:56:29PM -0600, Eric Sandeen wrote: > 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> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > 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 16ee4d9..0b80613 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 b108a06..29fc344 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 f973b6b..1ca6a2d 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 b2dd91b..312a0d0 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(); > -- > 1.8.3.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index 16ee4d9..0b80613 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 b108a06..29fc344 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 f973b6b..1ca6a2d 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 b2dd91b..312a0d0 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();
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> --- copy/xfs_copy.c | 1 + db/init.c | 2 ++ mkfs/xfs_mkfs.c | 1 + repair/xfs_repair.c | 1 + 4 files changed, 5 insertions(+)