Btrfs: use bitfield instead of integer data type for the some variants in btrfs_root

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>

1 files changed, 14 insertions, 11 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 1bcfcdb23cf4..2f10e12ae94c 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -224,7 +224,8 @@ static struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)
 static void add_root_to_dirty_list(struct btrfs_root *root)
 {
         spin_lock(&root->fs_info->trans_lock);
-        if (root->track_dirty && list_empty(&root->dirty_list)) {
+        if (test_bit(BTRFS_ROOT_TRACK_DIRTY, &root->state) &&
+            list_empty(&root->dirty_list)) {
                 list_add(&root->dirty_list,
                          &root->fs_info->dirty_cowonly_roots);
         }
@@ -246,9 +247,10 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
         int level;
         struct btrfs_disk_key disk_key;
 
-        WARN_ON(root->ref_cows && trans->transid !=
-                root->fs_info->running_transaction->transid);
-        WARN_ON(root->ref_cows && trans->transid != root->last_trans);
+        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
+                trans->transid != root->fs_info->running_transaction->transid);
+        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
+                trans->transid != root->last_trans);
 
         level = btrfs_header_level(buf);
         if (level == 0)
@@ -997,14 +999,14 @@ int btrfs_block_can_be_shared(struct btrfs_root *root,
          * snapshot and the block was not allocated by tree relocation,
          * we know the block is not shared.
          */
-        if (root->ref_cows &&
+        if (test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
             buf != root->node && buf != root->commit_root &&
             (btrfs_header_generation(buf) <=
              btrfs_root_last_snapshot(&root->root_item) ||
              btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC)))
                 return 1;
 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0
-        if (root->ref_cows &&
+        if (test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
             btrfs_header_backref_rev(buf) < BTRFS_MIXED_BACKREF_REV)
                 return 1;
 #endif
@@ -1146,9 +1148,10 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
 
         btrfs_assert_tree_locked(buf);
 
-        WARN_ON(root->ref_cows && trans->transid !=
-                root->fs_info->running_transaction->transid);
-        WARN_ON(root->ref_cows && trans->transid != root->last_trans);
+        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
+                trans->transid != root->fs_info->running_transaction->transid);
+        WARN_ON(test_bit(BTRFS_ROOT_REF_COWS, &root->state) &&
+                trans->transid != root->last_trans);
 
         level = btrfs_header_level(buf);
 
@@ -1193,7 +1196,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
                 return ret;
         }
 
-        if (root->ref_cows) {
+        if (test_bit(BTRFS_ROOT_REF_COWS, &root->state)) {
                 ret = btrfs_reloc_cow_block(trans, root, buf, cow);
                 if (ret)
                         return ret;
@@ -1556,7 +1559,7 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans,
             !btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN) &&
             !(root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID &&
               btrfs_header_flag(buf, BTRFS_HEADER_FLAG_RELOC)) &&
-            !root->force_cow)
+            !test_bit(BTRFS_ROOT_FORCE_COW, &root->state))
                 return 0;
         return 1;
 }