diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-03-07 00:46:29 (GMT) |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-03-07 00:46:29 (GMT) |
| commit | 2cc65e3e57d636a159d92945655b1574e47dba63 (patch) | |
| tree | a86ebdd6cb7c7cfbf1d4a547df6254a1a9849ff1 /fs/btrfs/volumes.c | |
| parent | 154ea2893002618bc3f9a1e2d8186c65490968b1 (diff) | |
| parent | 9b53157aac7366cea413ee29b629f83225829e87 (diff) | |
| download | linux-2cc65e3e57d636a159d92945655b1574e47dba63.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 35bb2d4..9ff454d 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2379,7 +2379,11 @@ static int btrfs_relocate_chunk(struct btrfs_root *root, return ret; trans = btrfs_start_transaction(root, 0); - BUG_ON(IS_ERR(trans)); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + btrfs_std_error(root->fs_info, ret); + return ret; + } lock_chunks(root); @@ -3050,7 +3054,8 @@ static void __cancel_balance(struct btrfs_fs_info *fs_info) unset_balance_control(fs_info); ret = del_balance_item(fs_info->tree_root); - BUG_ON(ret); + if (ret) + btrfs_std_error(fs_info, ret); atomic_set(&fs_info->mutually_exclusive_operation_running, 0); } |