From 31dda19f859dba4e5a7cc5e1d409b2e01e882861 Mon Sep 17 00:00:00 2001 From: Daniel J Blueman Date: Thu, 23 Jun 2011 23:01:01 +0800 Subject: [PATCH] --- yaml --- r: 274672 b: refs/heads/master c: 068132bad1de70f85f5f6d12c36d64f8f7848d92 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/print-tree.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5f6a713e590b..6a5183cdc66c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60d2adbb1e7fee1cb4bc67f70bd0bd8ace7b6c3c +refs/heads/master: 068132bad1de70f85f5f6d12c36d64f8f7848d92 diff --git a/trunk/fs/btrfs/print-tree.c b/trunk/fs/btrfs/print-tree.c index fb2605d998e9..f38e452486b8 100644 --- a/trunk/fs/btrfs/print-tree.c +++ b/trunk/fs/btrfs/print-tree.c @@ -158,8 +158,7 @@ static void print_extent_ref_v0(struct extent_buffer *eb, int slot) void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l) { int i; - u32 type; - u32 nr = btrfs_header_nritems(l); + u32 type, nr; struct btrfs_item *item; struct btrfs_root_item *ri; struct btrfs_dir_item *di; @@ -172,6 +171,11 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l) struct btrfs_key key; struct btrfs_key found_key; + if (!l) + return; + + nr = btrfs_header_nritems(l); + printk(KERN_INFO "leaf %llu total ptrs %d free space %d\n", (unsigned long long)btrfs_header_bytenr(l), nr, btrfs_leaf_free_space(root, l));