diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-06-09 18:12:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-30 20:56:35 +0100 |
commit | 0c10be57b72901464d4bb9ea7b5383c42b08bcae (patch) | |
tree | 78e8746ac8215577208ce658bfb8001f43d9a6b9 /meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch | |
parent | 64497638e70c97f417c2bcdaf99ffcc843ad58ec (diff) | |
download | poky-0c10be57b72901464d4bb9ea7b5383c42b08bcae.tar.gz |
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 <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/upstream-tmp/0014-btrfs-progs-fix-wrong-extent-buffer-size-when-readin.patch | 33 |
1 files changed, 33 insertions, 0 deletions
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 @@ | |||
1 | Upstream-Status: Inappropriate [Backport] | ||
2 | From 32ba8209276d3ac1723ea6373aaec9d6399ce5ca Mon Sep 17 00:00:00 2001 | ||
3 | From: Miao Xie <miaox@cn.fujitsu.com> | ||
4 | Date: Tue, 13 Jul 2010 09:18:04 +0000 | ||
5 | Subject: [PATCH 14/15] btrfs-progs: fix wrong extent buffer size when reading tree block | ||
6 | |||
7 | the root extent buffer of a tree may not be a leaf, so we must get the right | ||
8 | size by its level when reading it. | ||
9 | |||
10 | Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> | ||
11 | Signed-off-by: Chris Mason <chris.mason@oracle.com> | ||
12 | --- | ||
13 | debug-tree.c | 4 +++- | ||
14 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/debug-tree.c b/debug-tree.c | ||
17 | index 0525354..99c12d6 100644 | ||
18 | --- a/debug-tree.c | ||
19 | +++ b/debug-tree.c | ||
20 | @@ -212,7 +212,9 @@ again: | ||
21 | read_extent_buffer(leaf, &ri, offset, sizeof(ri)); | ||
22 | buf = read_tree_block(tree_root_scan, | ||
23 | btrfs_root_bytenr(&ri), | ||
24 | - tree_root_scan->leafsize, 0); | ||
25 | + btrfs_level_size(tree_root_scan, | ||
26 | + btrfs_root_level(&ri)), | ||
27 | + 0); | ||
28 | switch(found_key.objectid) { | ||
29 | case BTRFS_ROOT_TREE_OBJECTID: | ||
30 | if (!skip) | ||
31 | -- | ||
32 | 1.7.2.3 | ||
33 | |||