From 0c10be57b72901464d4bb9ea7b5383c42b08bcae Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 9 Jun 2011 18:12:12 -0700 Subject: btrfs-tools: new recipe for tools to operate on btrfs images Added these patches to the recipe to get it to work as desired: Upstream patches from tmp & for-dragonn branches of repository http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git Also included the debian patches. Nitin's patch to make the makefile cross friendly And Xin Zhong's patch to improve mkfs.btrfs (From OE-Core rev: 57a2140dc9673c65fea088fbd024fbd002e6937b) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- ...-fix-wrong-extent-buffer-size-when-readin.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch') diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch new file mode 100644 index 0000000000..6a0f9d6952 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch @@ -0,0 +1,33 @@ +Upstream-Status: Inappropriate [Backport] +From 32ba8209276d3ac1723ea6373aaec9d6399ce5ca Mon Sep 17 00:00:00 2001 +From: Miao Xie +Date: Tue, 13 Jul 2010 09:18:04 +0000 +Subject: [PATCH 14/15] btrfs-progs: fix wrong extent buffer size when reading tree block + +the root extent buffer of a tree may not be a leaf, so we must get the right +size by its level when reading it. + +Signed-off-by: Miao Xie +Signed-off-by: Chris Mason +--- + debug-tree.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/debug-tree.c b/debug-tree.c +index 0525354..99c12d6 100644 +--- a/debug-tree.c ++++ b/debug-tree.c +@@ -212,7 +212,9 @@ again: + read_extent_buffer(leaf, &ri, offset, sizeof(ri)); + buf = read_tree_block(tree_root_scan, + btrfs_root_bytenr(&ri), +- tree_root_scan->leafsize, 0); ++ btrfs_level_size(tree_root_scan, ++ btrfs_root_level(&ri)), ++ 0); + switch(found_key.objectid) { + case BTRFS_ROOT_TREE_OBJECTID: + if (!skip) +-- +1.7.2.3 + -- cgit v1.2.3-54-g00ecf