4 files changed, 19 insertions, 11 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index a6a9d4e8b491..6e7556aa02e8 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -551,10 +551,10 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
                 ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
                 if (ret > 0) {
                         if (path->slots[0] == 0)
-                                goto out;
+                                break;
                         path->slots[0]--;
                 } else if (ret < 0) {
-                        goto out;
+                        break;
                 }
 
                 leaf = path->nodes[0];
@@ -579,7 +579,8 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
                 /* delete the entire item, it is inside our range */
                 if (key.offset >= bytenr && csum_end <= end_byte) {
                         ret = btrfs_del_item(trans, root, path);
-                        BUG_ON(ret);
+                        if (ret)
+                                goto out;
                         if (key.offset == bytenr)
                                 break;
                 } else if (key.offset < bytenr && csum_end > end_byte) {
@@ -633,9 +634,10 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
                 }
                 btrfs_release_path(root, path);
         }
+        ret = 0;
 out:
         btrfs_free_path(path);
-        return 0;
+        return ret;
 }
 
 int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 6928bff62daa..2cf5f5142159 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -385,7 +385,10 @@ again:
                 *sequence = btrfs_root_ref_sequence(leaf, ref);
 
                 ret = btrfs_del_item(trans, tree_root, path);
-                BUG_ON(ret);
+                if (ret) {
+                        err = ret;
+                        goto out;
+                }
         } else
                 err = -ENOENT;
 
@@ -397,6 +400,7 @@ again:
                 goto again;
         }
 
+out:
         btrfs_free_path(path);
         return err;
 }
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index f997ec0c1ba4..cf2baeb70462 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1050,7 +1050,8 @@ static noinline int fixup_inode_link_counts(struct btrfs_trans_handle *trans,
                         break;
 
                 ret = btrfs_del_item(trans, root, path);
-                BUG_ON(ret);
+                if (ret)
+                        goto out;
 
                 btrfs_release_path(root, path);
                 inode = read_one_inode(root, key.offset);
@@ -1068,8 +1069,10 @@ static noinline int fixup_inode_link_counts(struct btrfs_trans_handle *trans,
                  */
                 key.offset = (u64)-1;
         }
+        ret = 0;
+out:
         btrfs_release_path(root, path);
-        return 0;
+        return ret;
 }
 
 
@@ -2587,7 +2590,8 @@ static int drop_objectid_items(struct btrfs_trans_handle *trans,
                         break;
 
                 ret = btrfs_del_item(trans, log, path);
-                BUG_ON(ret);
+                if (ret)
+                        break;
                 btrfs_release_path(log, path);
         }
         btrfs_release_path(log, path);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index e40cdd5b4669..deca1a0326ad 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -967,7 +967,6 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans,
         if (device->bytes_used > 0)
                 device->bytes_used -= btrfs_dev_extent_length(leaf, extent);
         ret = btrfs_del_item(trans, root, path);
-        BUG_ON(ret);
 
 out:
         btrfs_free_path(path);
@@ -1770,10 +1769,9 @@ static int btrfs_free_chunk(struct btrfs_trans_handle *trans,
         BUG_ON(ret);
 
         ret = btrfs_del_item(trans, root, path);
-        BUG_ON(ret);
 
         btrfs_free_path(path);
-        return 0;
+        return ret;
 }
 
 static int btrfs_del_sys_chunk(struct btrfs_root *root, u64 chunk_objectid, u64