btrfs-progs: Add all missing btrfs_close_all_devices to standalone tools

This patch add all missing btrfs_close_all_devices() to standalone
tools in btrfs progs, to avoid memory leak.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Zhao Lei 2015-10-26 18:28:20 +08:00 committed by David Sterba
parent da34dbd149
commit e72cb5de12
6 changed files with 10 additions and 1 deletions

View File

@ -508,5 +508,6 @@ int main(int argc, char **argv)
out:
close_ctree(root);
free(roots);
btrfs_close_all_devices();
return ret;
}

View File

@ -28,6 +28,7 @@
#include "disk-io.h"
#include "print-tree.h"
#include "transaction.h"
#include "volumes.h"
#include "utils.h"
static int print_usage(int ret)
@ -428,5 +429,7 @@ no_node:
printf("uuid %s\n", uuidbuf);
printf("%s\n", PACKAGE_STRING);
close_root:
return close_ctree(root);
ret = close_ctree(root);
btrfs_close_all_devices();
return ret;
}

View File

@ -216,5 +216,6 @@ int main(int argc, char **argv)
out:
btrfs_find_root_free(&result);
close_ctree(root);
btrfs_close_all_devices();
return ret;
}

View File

@ -359,5 +359,6 @@ close:
close_ctree(root);
if (ret < 0)
ret = 1;
btrfs_close_all_devices();
return ret;
}

View File

@ -23,6 +23,7 @@
#include <sys/stat.h>
#include "kerncompat.h"
#include "ctree.h"
#include "volumes.h"
#include "disk-io.h"
#include "print-tree.h"
#include "transaction.h"
@ -101,5 +102,6 @@ int main(int ac, char **av)
*/
printf("using SB copy %llu, bytenr %llu\n", (unsigned long long)num,
(unsigned long long)bytenr);
btrfs_close_all_devices();
return ret;
}

View File

@ -548,6 +548,7 @@ int main(int argc, char *argv[])
}
out:
close_ctree(root);
btrfs_close_all_devices();
return ret;
}