btrfs: handle errors from btrfs_dec_ref() properly

commit 5eb178f373b4f16f3b42d55ff88fc94dd95b93b1 upstream.

In walk_up_proc() we BUG_ON(ret) from btrfs_dec_ref().  This is
incorrect, we have proper error handling here, return the error.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Jianqi Ren <jianqi.ren.cn@windriver.com>
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a8089bf2be98b6938ecab98bebe877624a6ea4bf..cf2b65be04b5a4ddb0f098795405fc018afd3f44 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5240,7 +5240,10 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
                                ret = btrfs_dec_ref(trans, root, eb, 1);
                        else
                                ret = btrfs_dec_ref(trans, root, eb, 0);
-                       BUG_ON(ret); /* -ENOMEM */
+                       if (ret) {
+                               btrfs_abort_transaction(trans, ret);
+                               return ret;
+                       }
                        if (is_fstree(root->root_key.objectid)) {
                                ret = btrfs_qgroup_trace_leaf_items(trans, eb);
                                if (ret) {