diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-09-27 16:38:20 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-11-11 21:53:57 -0500 |
| commit | c16ce1901431629fbe5b9387cc966d62a089e4df (patch) | |
| tree | 9c068f5070d487ea1cb04afd0a71f6828e24a794 /fs | |
| parent | 1de2cfde93c20a0357ff1dffed901598470facf3 (diff) | |
| download | linux-stable-c16ce1901431629fbe5b9387cc966d62a089e4df.tar.gz linux-stable-c16ce1901431629fbe5b9387cc966d62a089e4df.tar.bz2 linux-stable-c16ce1901431629fbe5b9387cc966d62a089e4df.zip | |
Btrfs: remove all BUG_ON()'s from commit_cowonly_roots
Noticed this when forcing errors to happen during delayed ref running. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/transaction.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index a1343e81c59d..f08e22885c21 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -950,16 +950,19 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans, return ret; ret = btrfs_run_dev_stats(trans, root->fs_info); - WARN_ON(ret); + if (ret) + return ret; ret = btrfs_run_dev_replace(trans, root->fs_info); - WARN_ON(ret); - + if (ret) + return ret; ret = btrfs_run_qgroups(trans, root->fs_info); - BUG_ON(ret); + if (ret) + return ret; /* run_qgroups might have added some more refs */ ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1); - BUG_ON(ret); + if (ret) + return ret; while (!list_empty(&fs_info->dirty_cowonly_roots)) { next = fs_info->dirty_cowonly_roots.next; |