git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus
[pandora-kernel.git]
/
fs
/
btrfs
/
print-tree.c
diff --git
a/fs/btrfs/print-tree.c
b/fs/btrfs/print-tree.c
index
6d6523d
..
0d126be
100644
(file)
--- a/
fs/btrfs/print-tree.c
+++ b/
fs/btrfs/print-tree.c
@@
-309,7
+309,7
@@
void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
}
printk(KERN_INFO "node %llu level %d total ptrs %d free spc %u\n",
(unsigned long long)btrfs_header_bytenr(c),
}
printk(KERN_INFO "node %llu level %d total ptrs %d free spc %u\n",
(unsigned long long)btrfs_header_bytenr(c),
-
btrfs_header_level(c)
, nr,
+
level
, nr,
(u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
for (i = 0; i < nr; i++) {
btrfs_node_key_to_cpu(c, &key, i);
(u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
for (i = 0; i < nr; i++) {
btrfs_node_key_to_cpu(c, &key, i);
@@
-326,10
+326,10
@@
void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
btrfs_level_size(root, level - 1),
btrfs_node_ptr_generation(c, i));
if (btrfs_is_leaf(next) &&
btrfs_level_size(root, level - 1),
btrfs_node_ptr_generation(c, i));
if (btrfs_is_leaf(next) &&
-
btrfs_header_level(c)
!= 1)
+
level
!= 1)
BUG();
if (btrfs_header_level(next) !=
BUG();
if (btrfs_header_level(next) !=
-
btrfs_header_level(c)
- 1)
+
level
- 1)
BUG();
btrfs_print_tree(root, next);
free_extent_buffer(next);
BUG();
btrfs_print_tree(root, next);
free_extent_buffer(next);