1 files changed, 10 insertions, 9 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 651a26a6c651..e697afd18159 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -356,14 +356,14 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                      root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) &&
                     !(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF)) {
                         ret = btrfs_inc_ref(trans, root, buf, 1, 1);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
 
                         if (root->root_key.objectid ==
                             BTRFS_TREE_RELOC_OBJECTID) {
                                 ret = btrfs_dec_ref(trans, root, buf, 0, 1);
-                                BUG_ON(ret);
+                                BUG_ON(ret); /* -ENOMEM */
                                 ret = btrfs_inc_ref(trans, root, cow, 1, 1);
-                                BUG_ON(ret);
+                                BUG_ON(ret); /* -ENOMEM */
                         }
                         new_flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF;
                 } else {
@@ -373,7 +373,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                                 ret = btrfs_inc_ref(trans, root, cow, 1, 1);
                         else
                                 ret = btrfs_inc_ref(trans, root, cow, 0, 1);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
                 }
                 if (new_flags != 0) {
                         ret = btrfs_set_disk_extent_flags(trans, root,
@@ -390,9 +390,9 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
                                 ret = btrfs_inc_ref(trans, root, cow, 1, 1);
                         else
                                 ret = btrfs_inc_ref(trans, root, cow, 0, 1);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
                         ret = btrfs_dec_ref(trans, root, buf, 1, 1);
-                        BUG_ON(ret);
+                        BUG_ON(ret); /* -ENOMEM */
                 }
                 clean_tree_block(trans, root, buf);
                 *last_ref = 1;
@@ -475,7 +475,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
 
         ret = update_ref_for_cow(trans, root, buf, cow, &last_ref);
         if (ret) {
-                btrfs_std_error(root->fs_info, ret);
+                btrfs_abort_transaction(trans, root, ret);
                 return ret;
         }
 
@@ -2713,7 +2713,8 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
                               path->nodes[1], slot - 1, &left);
         if (ret) {
                 /* we hit -ENOSPC, but it isn't fatal here */
-                ret = 1;
+                if (ret == -ENOSPC)
+                        ret = 1;
                 goto out;
         }
 
@@ -4017,7 +4018,7 @@ find_next_key:
                 }
                 btrfs_set_path_blocking(path);
                 cur = read_node_slot(root, cur, slot);
-                BUG_ON(!cur);
+                BUG_ON(!cur); /* -ENOMEM */
 
                 btrfs_tree_read_lock(cur);