[PATCH 1/2] btrfs-progs: clean up unnecessary headers and move radix_tree_init()

[PATCH 1/2] btrfs-progs: clean up unnecessary headers and move radix_tree_init()

[Alexander Fougner]

Signed-off-by: Alexander Fougner <fougner89@gmail.com>
---
 btrfs-debug-tree.c       | 13 ++-----------
 cmds-inspect-dump-tree.c |  2 --
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/btrfs-debug-tree.c b/btrfs-debug-tree.c
index 057a715..d6e5a69 100644
--- a/btrfs-debug-tree.c
+++ b/btrfs-debug-tree.c
@@ -16,18 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <uuid/uuid.h>
-#include <getopt.h>
-
-#include "kerncompat.h"
-#include "radix-tree.h"
-#include "ctree.h"
 #include "disk-io.h"
-#include "print-tree.h"
-#include "transaction.h"
 #include "volumes.h"
 #include "utils.h"
 #include "commands.h"
@@ -42,6 +31,8 @@ int main(int ac, char **av)
 	if (ac > 1 && !strcmp(av[1], "--help"))
 		usage(cmd_inspect_dump_tree_usage);
 
+	radix_tree_init();
+
 	ret = cmd_inspect_dump_tree(ac, av);
 
 	btrfs_close_all_devices();
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 8a3cf0b..0dab506 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -128,8 +128,6 @@ int cmd_inspect_dump_tree(int ac, char **av)
 	struct btrfs_root *tree_root_scan;
 	u64 tree_id = 0;
 
-	radix_tree_init();
-
 	while (1) {
 		int c;
 		static const struct option long_options[] = {
-- 
2.7.1

[PATCH 2/2] btrfs-progs: add completion for subcommand dump-tree

[Alexander Fougner]

Signed-off-by: Alexander Fougner <fougner89@gmail.com>
---
 btrfs-completion | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/btrfs-completion b/btrfs-completion
index a34191b..7631911 100644
--- a/btrfs-completion
+++ b/btrfs-completion
@@ -20,13 +20,13 @@ _btrfs_mnts()
 	COMPREPLY+=( $( compgen -W "$MNTS" -- "$cur" ) )
 }
 
-_btrfs() 
+_btrfs()
 {
 	local cur prev words cword
     _init_completion || return
 
     COMPREPLY=()
-    
+
 	local cmd=${words[1]}
 
     commands='subvolume filesystem balance device scrub check rescue restore inspect-internal property send receive quota qgroup replace help version'
@@ -36,7 +36,7 @@ _btrfs()
     commands_device='scan add delete remove ready stats usage'
     commands_scrub='start cancel resume status'
     commands_rescue='chunk-recover super-recover'
-    commands_inspect_internal='inode-resolve logical-resolve subvolid-resolve rootid min-dev-size'
+    commands_inspect_internal='inode-resolve logical-resolve subvolid-resolve rootid min-dev-size dump-tree'
     commands_property='get set list'
     commands_quota='enable disable rescan'
     commands_qgroup='assign remove create destroy show limit'
@@ -146,7 +146,7 @@ _btrfs()
     fi
 
     _filedir -d
-    return 0  
+    return 0
 }
 
 complete -F _btrfs btrfs
-- 
2.7.1

Re: [PATCH 1/2] btrfs-progs: clean up unnecessary headers and move radix_tree_init()

[David Sterba]

On Thu, Feb 11, 2016 at 02:01:55PM +0100, Alexander Fougner wrote:
> Signed-off-by: Alexander Fougner <fougner89@gmail.com>

Applied, thanks.

Re: [PATCH 2/2] btrfs-progs: add completion for subcommand dump-tree

[David Sterba]

On Thu, Feb 11, 2016 at 02:01:56PM +0100, Alexander Fougner wrote:
> Signed-off-by: Alexander Fougner <fougner89@gmail.com>

Applied, thanks.