Prep work for consolidating all of the space_info code into one file.
We need to export these so multiple files can use them.
Signed-off-by: Josef Bacik <jo...@toxicpanda.com>
---
fs/btrfs/extent-tree.c | 42 ++++++++++++++++++++----------------------
fs/btrfs/space-info.h | 6 ++++++
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 7b4232ee48a0..9dcda96ef309 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -75,12 +75,6 @@ static void dump_space_info(struct btrfs_fs_info *fs_info,
int dump_block_groups);
static int block_rsv_use_bytes(struct btrfs_block_rsv *block_rsv,
u64 num_bytes);
-static void space_info_add_new_bytes(struct btrfs_fs_info *fs_info,
- struct btrfs_space_info *space_info,
- u64 num_bytes);
-static void space_info_add_old_bytes(struct btrfs_fs_info *fs_info,
- struct btrfs_space_info *space_info,
- u64 num_bytes);
static noinline int
block_group_cache_done(struct btrfs_block_group_cache *cache)
@@ -3908,8 +3902,8 @@ static void update_space_info(struct btrfs_fs_info *info,
u64 flags,
found->bytes_readonly += bytes_readonly;
if (total_bytes > 0)
found->full = 0;
- space_info_add_new_bytes(info, found, total_bytes -
- bytes_used - bytes_readonly);
+ btrfs_space_info_add_new_bytes(info, found, total_bytes -
+ bytes_used - bytes_readonly);
spin_unlock(&found->lock);
*space_info = found;
}
@@ -5110,7 +5104,8 @@ static int wait_reserve_ticket(struct btrfs_fs_info
*fs_info,
spin_unlock(&space_info->lock);
if (reclaim_bytes)
- space_info_add_old_bytes(fs_info, space_info, reclaim_bytes);
+ btrfs_space_info_add_old_bytes(fs_info, space_info,
+ reclaim_bytes);
return ret;
}
@@ -5227,7 +5222,8 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info
*fs_info,
spin_unlock(&space_info->lock);
if (reclaim_bytes)
- space_info_add_old_bytes(fs_info, space_info, reclaim_bytes);
+ btrfs_space_info_add_old_bytes(fs_info, space_info,
+ reclaim_bytes);
ASSERT(list_empty(&ticket.list));
return ret;
}
@@ -5393,8 +5389,9 @@ void btrfs_migrate_to_delayed_refs_rsv(struct
btrfs_fs_info *fs_info,
trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv",
0, num_bytes, 1);
if (to_free)
- space_info_add_old_bytes(fs_info, delayed_refs_rsv->space_info,
- to_free);
+ btrfs_space_info_add_old_bytes(fs_info,
+ delayed_refs_rsv->space_info,
+ to_free);
}
/**
@@ -5437,9 +5434,9 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info
*fs_info,
* This is for space we already have accounted in space_info->bytes_may_use, so
* basically when we're returning space from block_rsv's.
*/
-static void space_info_add_old_bytes(struct btrfs_fs_info *fs_info,
- struct btrfs_space_info *space_info,
- u64 num_bytes)
+void btrfs_space_info_add_old_bytes(struct btrfs_fs_info *fs_info,
+ struct btrfs_space_info *space_info,
+ u64 num_bytes)
{
struct reserve_ticket *ticket;
struct list_head *head;
@@ -5497,9 +5494,9 @@ static void space_info_add_old_bytes(struct btrfs_fs_info
*fs_info,
* space_info->bytes_may_use yet. So if we allocate a chunk or unpin an extent
* we use this helper.
*/
-static void space_info_add_new_bytes(struct btrfs_fs_info *fs_info,
- struct btrfs_space_info *space_info,
- u64 num_bytes)
+void btrfs_space_info_add_new_bytes(struct btrfs_fs_info *fs_info,
+ struct btrfs_space_info *space_info,
+ u64 num_bytes)
{
struct reserve_ticket *ticket;
struct list_head *head = &space_info->priority_tickets;
@@ -5583,8 +5580,8 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info
*fs_info,
spin_unlock(&dest->lock);
}
if (num_bytes)
- space_info_add_old_bytes(fs_info, space_info,
- num_bytes);
+ btrfs_space_info_add_old_bytes(fs_info, space_info,
+ num_bytes);
}
if (qgroup_to_release_ret)
*qgroup_to_release_ret = qgroup_to_release;
@@ -6760,8 +6757,9 @@ static int unpin_extent_range(struct btrfs_fs_info
*fs_info,
spin_unlock(&global_rsv->lock);
/* Add to any tickets we may have */
if (len)
- space_info_add_new_bytes(fs_info, space_info,
- len);
+ btrfs_space_info_add_new_bytes(fs_info,
+ space_info,
+ len);
}
spin_unlock(&space_info->lock);
}
diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index 2f69cf9e13da..b3a43fe62b7c 100644
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -78,4 +78,10 @@ static inline bool btrfs_mixed_space_info(struct
btrfs_space_info *space_info)
(space_info->flags & BTRFS_BLOCK_GROUP_DATA));
}
+void btrfs_space_info_add_new_bytes(struct btrfs_fs_info *fs_info,
+ struct btrfs_space_info *space_info,
+ u64 num_bytes);
+void btrfs_space_info_add_old_bytes(struct btrfs_fs_info *fs_info,
+ struct btrfs_space_info *space_info,
+ u64 num_bytes);
#endif /* BTRFS_SPACE_INFO_H */
--
2.14.3
