btrfs: move fs_info::flags enum to fs.h

These definitions are fs wide, take them out of ctree.h and put them in
fs.h.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 86af9d3..149c185 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -280,69 +280,6 @@ struct btrfs_discard_ctl {
        atomic64_t discard_bytes_saved;
 };
 
-enum {
-       BTRFS_FS_CLOSING_START,
-       BTRFS_FS_CLOSING_DONE,
-       BTRFS_FS_LOG_RECOVERING,
-       BTRFS_FS_OPEN,
-       BTRFS_FS_QUOTA_ENABLED,
-       BTRFS_FS_UPDATE_UUID_TREE_GEN,
-       BTRFS_FS_CREATING_FREE_SPACE_TREE,
-       BTRFS_FS_BTREE_ERR,
-       BTRFS_FS_LOG1_ERR,
-       BTRFS_FS_LOG2_ERR,
-       BTRFS_FS_QUOTA_OVERRIDE,
-       /* Used to record internally whether fs has been frozen */
-       BTRFS_FS_FROZEN,
-       /*
-        * Indicate that balance has been set up from the ioctl and is in the
-        * main phase. The fs_info::balance_ctl is initialized.
-        */
-       BTRFS_FS_BALANCE_RUNNING,
-
-       /*
-        * Indicate that relocation of a chunk has started, it's set per chunk
-        * and is toggled between chunks.
-        */
-       BTRFS_FS_RELOC_RUNNING,
-
-       /* Indicate that the cleaner thread is awake and doing something. */
-       BTRFS_FS_CLEANER_RUNNING,
-
-       /*
-        * The checksumming has an optimized version and is considered fast,
-        * so we don't need to offload checksums to workqueues.
-        */
-       BTRFS_FS_CSUM_IMPL_FAST,
-
-       /* Indicate that the discard workqueue can service discards. */
-       BTRFS_FS_DISCARD_RUNNING,
-
-       /* Indicate that we need to cleanup space cache v1 */
-       BTRFS_FS_CLEANUP_SPACE_CACHE_V1,
-
-       /* Indicate that we can't trust the free space tree for caching yet */
-       BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED,
-
-       /* Indicate whether there are any tree modification log users */
-       BTRFS_FS_TREE_MOD_LOG_USERS,
-
-       /* Indicate that we want the transaction kthread to commit right now. */
-       BTRFS_FS_COMMIT_TRANS,
-
-       /* Indicate we have half completed snapshot deletions pending. */
-       BTRFS_FS_UNFINISHED_DROPS,
-
-       /* Indicate we have to finish a zone to do next allocation. */
-       BTRFS_FS_NEED_ZONE_FINISH,
-
-#if BITS_PER_LONG == 32
-       /* Indicate if we have error/warn message printed on 32bit systems */
-       BTRFS_FS_32BIT_ERROR,
-       BTRFS_FS_32BIT_WARN,
-#endif
-};
-
 /*
  * Exclusive operations (device replace, resize, device add/remove, balance)
  */
@@ -1037,11 +974,6 @@ enum btrfs_lockdep_trans_states {
                                 &lock##_key, 0);                               \
        } while (0)
 
-static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info)
-{
-       clear_and_wake_up_bit(BTRFS_FS_UNFINISHED_DROPS, &fs_info->flags);
-}
-
 /*
  * Record swapped tree blocks of a subvolume tree for delayed subtree trace
  * code. For detail check comment in fs/btrfs/qgroup.c.

diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h
index 4799812..7337707 100644 (file)
--- a/fs/btrfs/fs.h
+++ b/fs/btrfs/fs.h
@@ -34,6 +34,69 @@ enum {
        BTRFS_FS_STATE_COUNT
 };
 
+enum {
+       BTRFS_FS_CLOSING_START,
+       BTRFS_FS_CLOSING_DONE,
+       BTRFS_FS_LOG_RECOVERING,
+       BTRFS_FS_OPEN,
+       BTRFS_FS_QUOTA_ENABLED,
+       BTRFS_FS_UPDATE_UUID_TREE_GEN,
+       BTRFS_FS_CREATING_FREE_SPACE_TREE,
+       BTRFS_FS_BTREE_ERR,
+       BTRFS_FS_LOG1_ERR,
+       BTRFS_FS_LOG2_ERR,
+       BTRFS_FS_QUOTA_OVERRIDE,
+       /* Used to record internally whether fs has been frozen */
+       BTRFS_FS_FROZEN,
+       /*
+        * Indicate that balance has been set up from the ioctl and is in the
+        * main phase. The fs_info::balance_ctl is initialized.
+        */
+       BTRFS_FS_BALANCE_RUNNING,
+
+       /*
+        * Indicate that relocation of a chunk has started, it's set per chunk
+        * and is toggled between chunks.
+        */
+       BTRFS_FS_RELOC_RUNNING,
+
+       /* Indicate that the cleaner thread is awake and doing something. */
+       BTRFS_FS_CLEANER_RUNNING,
+
+       /*
+        * The checksumming has an optimized version and is considered fast,
+        * so we don't need to offload checksums to workqueues.
+        */
+       BTRFS_FS_CSUM_IMPL_FAST,
+
+       /* Indicate that the discard workqueue can service discards. */
+       BTRFS_FS_DISCARD_RUNNING,
+
+       /* Indicate that we need to cleanup space cache v1 */
+       BTRFS_FS_CLEANUP_SPACE_CACHE_V1,
+
+       /* Indicate that we can't trust the free space tree for caching yet */
+       BTRFS_FS_FREE_SPACE_TREE_UNTRUSTED,
+
+       /* Indicate whether there are any tree modification log users */
+       BTRFS_FS_TREE_MOD_LOG_USERS,
+
+       /* Indicate that we want the transaction kthread to commit right now. */
+       BTRFS_FS_COMMIT_TRANS,
+
+       /* Indicate we have half completed snapshot deletions pending. */
+       BTRFS_FS_UNFINISHED_DROPS,
+
+       /* Indicate we have to finish a zone to do next allocation. */
+       BTRFS_FS_NEED_ZONE_FINISH,
+
+#if BITS_PER_LONG == 32
+       /* Indicate if we have error/warn message printed on 32bit systems */
+       BTRFS_FS_32BIT_ERROR,
+       BTRFS_FS_32BIT_WARN,
+#endif
+};
+
 /*
  * Flags for mount options.
  *
@@ -168,6 +231,11 @@ static inline void btrfs_clear_sb_rdonly(struct super_block *sb)
        clear_bit(BTRFS_FS_STATE_RO, &btrfs_sb(sb)->fs_state);
 }
 
+static inline void btrfs_wake_unfinished_drop(struct btrfs_fs_info *fs_info)
+{
+       clear_and_wake_up_bit(BTRFS_FS_UNFINISHED_DROPS, &fs_info->flags);
+}
+
 #define BTRFS_FS_ERROR(fs_info)        (unlikely(test_bit(BTRFS_FS_STATE_ERROR, \
                                                   &(fs_info)->fs_state)))
 #define BTRFS_FS_LOG_CLEANUP_ERROR(fs_info)                            \

diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c
index 63676ea..fd0e0ad 100644 (file)
--- a/fs/btrfs/tests/qgroup-tests.c
+++ b/fs/btrfs/tests/qgroup-tests.c
@@ -10,6 +10,7 @@
 #include "../disk-io.h"
 #include "../qgroup.h"
 #include "../backref.h"
+#include "../fs.h"
 
 static int insert_normal_tree_ref(struct btrfs_root *root, u64 bytenr,
                                  u64 num_bytes, u64 parent, u64 root_objectid)

diff --git a/fs/btrfs/tree-mod-log.c b/fs/btrfs/tree-mod-log.c
index 41e5d9f..6908388 100644 (file)
--- a/fs/btrfs/tree-mod-log.c
+++ b/fs/btrfs/tree-mod-log.c
@@ -3,6 +3,7 @@
 #include "messages.h"
 #include "tree-mod-log.h"
 #include "disk-io.h"
+#include "fs.h"
 
 struct tree_mod_root {
        u64 logical;