diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2011-09-01 11:27:57 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2012-03-22 01:45:38 +0100 |
| commit | 305a26af5b2561a66859ef05ed7eb73d3c9f0913 (patch) | |
| tree | 9afdcd2ccbe2a72b7dadaf25f92a4a1ec109ecfe | |
| parent | b68dc2a93e794c8507338c91577a277efa4555d5 (diff) | |
btrfs: Go readonly on tree errors in balance_level
balace_level() seems to deal with missing tree nodes by BUG_ON(). Instead,
we can easily just set the file system readonly and bubble -EROFS back up
the stack.
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
| -rw-r--r-- | fs/btrfs/ctree.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 36e16bd5079..651a26a6c65 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -944,7 +944,12 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, /* promote the child to a root */ child = read_node_slot(root, mid, 0); - BUG_ON(!child); + if (!child) { + ret = -EROFS; + btrfs_std_error(root->fs_info, ret); + goto enospc; + } + btrfs_tree_lock(child); btrfs_set_lock_blocking(child); ret = btrfs_cow_block(trans, root, child, mid, 0, &child); @@ -1042,7 +1047,11 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, * otherwise we would have pulled some pointers from the * right */ - BUG_ON(!left); + if (!left) { + ret = -EROFS; + btrfs_std_error(root->fs_info, ret); + goto enospc; + } wret = balance_node_right(trans, root, mid, left); if (wret < 0) { ret = wret; |