btrfs-progs: btrfs: Add missing btrfs_close_all_devices for btrfs command
authorZhao Lei <zhaolei@cn.fujitsu.com>
Mon, 26 Oct 2015 10:28:18 +0000 (18:28 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 2 Nov 2015 08:35:07 +0000 (09:35 +0100)
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 <dsterba@suse.cz>
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
btrfs.c

diff --git a/btrfs.c b/btrfs.c
index 63df377..9416a29 100644 (file)
--- a/btrfs.c
+++ b/btrfs.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#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);
 }