aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Fasheh <mfasheh@suse.com>2011-08-29 14:30:39 -0700
committerDavid Sterba <dsterba@suse.cz>2012-03-22 01:45:38 +0100
commitb68dc2a93e794c8507338c91577a277efa4555d5 (patch)
treeb4e8cbdafdd893a22abbbd7edca989ea018b6a72
parente5df957328b18baa731307c66cfe8e7a4981df65 (diff)
btrfs: Don't BUG_ON errors from update_ref_for_cow()
__btrfs_cow_block(), the only caller of update_ref_for_cow() will BUG_ON() any error return. Instead, we can go read-only fs as update_ref_for_cow() manipulates disk data in a way which doesn't look like it's easily rolled back. Signed-off-by: Mark Fasheh <mfasheh@suse.de>
-rw-r--r--fs/btrfs/ctree.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 3b767d2b68e8..36e16bd50798 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -474,7 +474,10 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
BTRFS_FSID_SIZE);
ret = update_ref_for_cow(trans, root, buf, cow, &last_ref);
- BUG_ON(ret);
+ if (ret) {
+ btrfs_std_error(root->fs_info, ret);
+ return ret;
+ }
if (root->ref_cows)
btrfs_reloc_cow_block(trans, root, buf, cow);