1 files changed, 9 insertions, 6 deletions

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index b02e379b14c7..e88330d3df52 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -230,11 +230,13 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root,
 
         if (ret) {
                 trans->block_rsv = rsv;
-                WARN_ON(1);
+                btrfs_abort_transaction(trans, root, ret);
                 return ret;
         }
 
         ret = btrfs_update_inode(trans, root, inode);
+        if (ret)
+                btrfs_abort_transaction(trans, root, ret);
         trans->block_rsv = rsv;
 
         return ret;
@@ -869,7 +871,7 @@ int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
         io_ctl_prepare_pages(&io_ctl, inode, 0);
 
         lock_extent_bits(&BTRFS_I(inode)->io_tree, 0, i_size_read(inode) - 1,
-                         0, &cached_state, GFP_NOFS);
+                         0, &cached_state);
 
         node = rb_first(&ctl->free_space_offset);
         if (!node && cluster) {
@@ -1948,14 +1950,14 @@ again:
                  */
                 ret = btrfs_add_free_space(block_group, old_start,
                                            offset - old_start);
-                WARN_ON(ret);
+                WARN_ON(ret); /* -ENOMEM */
                 goto out;
         }
 
         ret = remove_from_bitmap(ctl, info, &offset, &bytes);
         if (ret == -EAGAIN)
                 goto again;
-        BUG_ON(ret);
+        BUG_ON(ret); /* logic error */
 out_lock:
         spin_unlock(&ctl->tree_lock);
 out:
@@ -2346,7 +2348,7 @@ again:
         rb_erase(&entry->offset_index, &ctl->free_space_offset);
         ret = tree_insert_offset(&cluster->root, entry->offset,
                                  &entry->offset_index, 1);
-        BUG_ON(ret);
+        BUG_ON(ret); /* -EEXIST; Logic error */
 
         trace_btrfs_setup_cluster(block_group, cluster,
                                   total_found * block_group->sectorsize, 1);
@@ -2439,7 +2441,7 @@ setup_cluster_no_bitmap(struct btrfs_block_group_cache *block_group,
                 ret = tree_insert_offset(&cluster->root, entry->offset,
                                          &entry->offset_index, 0);
                 total_size += entry->bytes;
-                BUG_ON(ret);
+                BUG_ON(ret); /* -EEXIST; Logic error */
         } while (node && entry != last);
 
         cluster->max_size = max_extent;
@@ -2830,6 +2832,7 @@ u64 btrfs_find_ino_for_alloc(struct btrfs_root *fs_root)
                 int ret;
 
                 ret = search_bitmap(ctl, entry, &offset, &count);
+                /* Logic error; Should be empty if it can't find anything */
                 BUG_ON(ret);
 
                 ino = offset;