1 files changed, 12 insertions, 11 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 49fd7b66d57b..4b5a1e1bdefb 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3578,7 +3578,7 @@ again:
         space_info->chunk_alloc = 0;
         spin_unlock(&space_info->lock);
 out:
-        mutex_unlock(&extent_root->fs_info->chunk_mutex);
+        mutex_unlock(&fs_info->chunk_mutex);
         return ret;
 }
 
@@ -4355,10 +4355,9 @@ static unsigned drop_outstanding_extent(struct inode *inode)
         BTRFS_I(inode)->outstanding_extents--;
 
         if (BTRFS_I(inode)->outstanding_extents == 0 &&
-            BTRFS_I(inode)->delalloc_meta_reserved) {
+            test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
+                               &BTRFS_I(inode)->runtime_flags))
                 drop_inode_space = 1;
-                BTRFS_I(inode)->delalloc_meta_reserved = 0;
-        }
 
         /*
          * If we have more or the same amount of outsanding extents than we have
@@ -4465,7 +4464,8 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
          * Add an item to reserve for updating the inode when we complete the
          * delalloc io.
          */
-        if (!BTRFS_I(inode)->delalloc_meta_reserved) {
+        if (!test_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
+                      &BTRFS_I(inode)->runtime_flags)) {
                 nr_extents++;
                 extra_reserve = 1;
         }
@@ -4511,7 +4511,8 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
 
         spin_lock(&BTRFS_I(inode)->lock);
         if (extra_reserve) {
-                BTRFS_I(inode)->delalloc_meta_reserved = 1;
+                set_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
+                        &BTRFS_I(inode)->runtime_flags);
                 nr_extents--;
         }
         BTRFS_I(inode)->reserved_extents += nr_extents;
@@ -5217,7 +5218,7 @@ out:
 void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root,
                            struct extent_buffer *buf,
-                           u64 parent, int last_ref, int for_cow)
+                           u64 parent, int last_ref)
 {
         struct btrfs_block_group_cache *cache = NULL;
         int ret;
@@ -5227,7 +5228,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
                                         buf->start, buf->len,
                                         parent, root->root_key.objectid,
                                         btrfs_header_level(buf),
-                                        BTRFS_DROP_DELAYED_REF, NULL, for_cow);
+                                        BTRFS_DROP_DELAYED_REF, NULL, 0);
                 BUG_ON(ret); /* -ENOMEM */
         }
 
@@ -6249,7 +6250,7 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
                                         struct btrfs_root *root, u32 blocksize,
                                         u64 parent, u64 root_objectid,
                                         struct btrfs_disk_key *key, int level,
-                                        u64 hint, u64 empty_size, int for_cow)
+                                        u64 hint, u64 empty_size)
 {
         struct btrfs_key ins;
         struct btrfs_block_rsv *block_rsv;
@@ -6297,7 +6298,7 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
                                         ins.objectid,
                                         ins.offset, parent, root_objectid,
                                         level, BTRFS_ADD_DELAYED_EXTENT,
-                                        extent_op, for_cow);
+                                        extent_op, 0);
                 BUG_ON(ret); /* -ENOMEM */
         }
         return buf;
@@ -6715,7 +6716,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
                                btrfs_header_owner(path->nodes[level + 1]));
         }
 
-        btrfs_free_tree_block(trans, root, eb, parent, wc->refs[level] == 1, 0);
+        btrfs_free_tree_block(trans, root, eb, parent, wc->refs[level] == 1);
 out:
         wc->refs[level] = 0;
         wc->flags[level] = 0;