Commit b783e62d authored Jul 13, 2011 by Josef Bacik Committed by Chris Mason Aug 01, 2011

Btrfs: don't print the leaf if we had an error



In __btrfs_free_extent we will print the leaf if we fail to find the extent we
wanted, but the problem is if we get an error we won't have a leaf so often this
leads to a NULL pointer dereference and we lose the error that actually
occurred.  So only print the leaf if ret > 0, which means we didn't find the
item we were looking for but we didn't error either.  This way the error is
preserved.

Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

parent bf5f32ec

fs/btrfs/extent-tree.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -4462,7 +4462,9 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
		printk(KERN_ERR "umm, got %d back from search"
		", was looking for %llu\n", ret,
		(unsigned long long)bytenr);
		btrfs_print_leaf(extent_root, path->nodes[0]);
		if (ret > 0)
		btrfs_print_leaf(extent_root,
		path->nodes[0]);
		}
		BUG_ON(ret);
		extent_slot = path->slots[0];

Admin message