From 30fd6f2e92695c355c8f76b8887cd4fade60cdac Mon Sep 17 00:00:00 2001 From: Zhao Lei Date: Mon, 26 Oct 2015 18:28:18 +0800 Subject: btrfs-progs: btrfs: Add missing btrfs_close_all_devices for btrfs command Adding a btrfs_close_all_devices() after command callback in btrfs.c can force-close all opened device before program exit, to avoid memory leak in all btrfs sub-command. Suggested-by: David Sterba Signed-off-by: Zhao Lei Signed-off-by: David Sterba --- btrfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/btrfs.c b/btrfs.c index 63df377a..9416a298 100644 --- a/btrfs.c +++ b/btrfs.c @@ -18,6 +18,7 @@ #include #include +#include "volumes.h" #include "crc32c.h" #include "commands.h" #include "utils.h" @@ -214,6 +215,7 @@ int main(int argc, char **argv) { const struct cmd_struct *cmd; const char *bname; + int ret; if ((bname = strrchr(argv[0], '/')) != NULL) bname++; @@ -242,5 +244,10 @@ int main(int argc, char **argv) crc32c_optimization_init(); fixup_argv0(argv, cmd->token); - exit(cmd->fn(argc, argv)); + + ret = cmd->fn(argc, argv); + + btrfs_close_all_devices(); + + exit(ret); } -- cgit v1.2.3