btrfs: move flush related definitions to space-info.h

[ Upstream commit f1e5c6185ca166cde0c7c2eeeab5d233ef315140 ]

This code is used in space-info.c, move the definitions to space-info.h.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Stable-dep-of: a11224a016d6 ("btrfs: fix memory leaks in create_space_info() error paths")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index da8986e0c422233d526496b7685e67799cb59acd..bd84a8b774a6880332c6fb1fe6699d39ad00d8e9 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2925,65 +2925,6 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
 
 void btrfs_clear_space_info_full(struct btrfs_fs_info *info);
 
-/*
- * Different levels for to flush space when doing space reservations.
- *
- * The higher the level, the more methods we try to reclaim space.
- */
-enum btrfs_reserve_flush_enum {
-       /* If we are in the transaction, we can't flush anything.*/
-       BTRFS_RESERVE_NO_FLUSH,
-
-       /*
-        * Flush space by:
-        * - Running delayed inode items
-        * - Allocating a new chunk
-        */
-       BTRFS_RESERVE_FLUSH_LIMIT,
-
-       /*
-        * Flush space by:
-        * - Running delayed inode items
-        * - Running delayed refs
-        * - Running delalloc and waiting for ordered extents
-        * - Allocating a new chunk
-        */
-       BTRFS_RESERVE_FLUSH_EVICT,
-
-       /*
-        * Flush space by above mentioned methods and by:
-        * - Running delayed iputs
-        * - Committing transaction
-        *
-        * Can be interrupted by a fatal signal.
-        */
-       BTRFS_RESERVE_FLUSH_DATA,
-       BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE,
-       BTRFS_RESERVE_FLUSH_ALL,
-
-       /*
-        * Pretty much the same as FLUSH_ALL, but can also steal space from
-        * global rsv.
-        *
-        * Can be interrupted by a fatal signal.
-        */
-       BTRFS_RESERVE_FLUSH_ALL_STEAL,
-};
-
-enum btrfs_flush_state {
-       FLUSH_DELAYED_ITEMS_NR  =       1,
-       FLUSH_DELAYED_ITEMS     =       2,
-       FLUSH_DELAYED_REFS_NR   =       3,
-       FLUSH_DELAYED_REFS      =       4,
-       FLUSH_DELALLOC          =       5,
-       FLUSH_DELALLOC_WAIT     =       6,
-       FLUSH_DELALLOC_FULL     =       7,
-       ALLOC_CHUNK             =       8,
-       ALLOC_CHUNK_FORCE       =       9,
-       RUN_DELAYED_IPUTS       =       10,
-       COMMIT_TRANS            =       11,
-};
-
 int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
                                     struct btrfs_block_rsv *rsv,
                                     int nitems, bool use_global_rsv);

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 052112d0daa7471a6d65b4d343b0dd6742d8d3dd..214168868ac084920f303f6bbd6254ade9066d17 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -14,6 +14,7 @@
 #include "qgroup.h"
 #include "locking.h"
 #include "inode-item.h"
+#include "space-info.h"
 
 #define BTRFS_DELAYED_WRITEBACK                512
 #define BTRFS_DELAYED_BACKGROUND       128

diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
index 5add022d3534f97e9b73724c258edd7ca9994be8..ce5c51ffdc0d04178d489ef9837c5262c3e8ec8b 100644 (file)
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
@@ -8,6 +8,7 @@
 #include "disk-io.h"
 #include "transaction.h"
 #include "print-tree.h"
+#include "space-info.h"
 
 struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf,
                                                   int slot,

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 055a631276ce110300cfbbb5c911e9dc9368fb70..07f62e3ba6a51c8b92e080797f18039344776811 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -10,6 +10,7 @@
 #include "ctree.h"
 #include "xattr.h"
 #include "compression.h"
+#include "space-info.h"
 
 #define BTRFS_PROP_HANDLERS_HT_BITS 8
 static DEFINE_HASHTABLE(prop_handlers_ht, BTRFS_PROP_HANDLERS_HT_BITS);

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 3fdf5519336f96041602fbd903e1af22c2f982c5..795df859cdbfc4089bbeb987a2a378181ed62a2e 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -27,6 +27,7 @@
 #include "subpage.h"
 #include "zoned.h"
 #include "inode-item.h"
+#include "space-info.h"
 
 /*
  * Relocation overview

diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index 99ce3225dd59dff9df79b6ce3c11c7a53270a2b1..fea2f93674e7cd53f6d6a1cdcc40a4d9743272a9 100644 (file)
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -5,6 +5,65 @@
 
 #include "volumes.h"
 
+/*
+ * Different levels for to flush space when doing space reservations.
+ *
+ * The higher the level, the more methods we try to reclaim space.
+ */
+enum btrfs_reserve_flush_enum {
+       /* If we are in the transaction, we can't flush anything.*/
+       BTRFS_RESERVE_NO_FLUSH,
+
+       /*
+        * Flush space by:
+        * - Running delayed inode items
+        * - Allocating a new chunk
+        */
+       BTRFS_RESERVE_FLUSH_LIMIT,
+
+       /*
+        * Flush space by:
+        * - Running delayed inode items
+        * - Running delayed refs
+        * - Running delalloc and waiting for ordered extents
+        * - Allocating a new chunk
+        */
+       BTRFS_RESERVE_FLUSH_EVICT,
+
+       /*
+        * Flush space by above mentioned methods and by:
+        * - Running delayed iputs
+        * - Committing transaction
+        *
+        * Can be interrupted by a fatal signal.
+        */
+       BTRFS_RESERVE_FLUSH_DATA,
+       BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE,
+       BTRFS_RESERVE_FLUSH_ALL,
+
+       /*
+        * Pretty much the same as FLUSH_ALL, but can also steal space from
+        * global rsv.
+        *
+        * Can be interrupted by a fatal signal.
+        */
+       BTRFS_RESERVE_FLUSH_ALL_STEAL,
+};
+
+enum btrfs_flush_state {
+       FLUSH_DELAYED_ITEMS_NR  = 1,
+       FLUSH_DELAYED_ITEMS     = 2,
+       FLUSH_DELAYED_REFS_NR   = 3,
+       FLUSH_DELAYED_REFS      = 4,
+       FLUSH_DELALLOC          = 5,
+       FLUSH_DELALLOC_WAIT     = 6,
+       FLUSH_DELALLOC_FULL     = 7,
+       ALLOC_CHUNK             = 8,
+       ALLOC_CHUNK_FORCE       = 9,
+       RUN_DELAYED_IPUTS       = 10,
+       COMMIT_TRANS            = 11,
+};
+
 struct btrfs_space_info {
        spinlock_t lock;