diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2022-10-26 15:08:17 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-12-05 18:00:45 +0100 |
| commit | b31bed170d5241d4c9e2fc572f31fc15b274a6c9 (patch) | |
| tree | 1a223db25f54ffc79e2ef164b79f40337aa3ab66 | |
| parent | cb9a10a6504bb35095e97f4839fcf353bf1458ea (diff) | |
btrfs: move btrfs_chunk_item_size out of ctree.h
This is used by the volumes code and the tree checker code. We want to
maintain inline however, so simply move it to volumes.h.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/ctree.h | 7 | ||||
| -rw-r--r-- | fs/btrfs/volumes.h | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 09005bd9bfef..1e0944c37547 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -54,13 +54,6 @@ struct btrfs_balance_control; struct btrfs_delayed_root; struct reloc_control; -static inline unsigned long btrfs_chunk_item_size(int num_stripes) -{ - BUG_ON(num_stripes == 0); - return sizeof(struct btrfs_chunk) + - sizeof(struct btrfs_stripe) * (num_stripes - 1); -} - /* Read ahead values for struct btrfs_path.reada */ enum { READA_NONE, diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index a20ee7d57831..b05124e62412 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -10,6 +10,7 @@ #include <linux/sort.h> #include <linux/btrfs.h> #include "async-thread.h" +#include "messages.h" #define BTRFS_MAX_DATA_CHUNK_SIZE (10ULL * SZ_1G) @@ -605,6 +606,13 @@ static inline enum btrfs_map_op btrfs_op(struct bio *bio) } } +static inline unsigned long btrfs_chunk_item_size(int num_stripes) +{ + ASSERT(num_stripes); + return sizeof(struct btrfs_chunk) + + sizeof(struct btrfs_stripe) * (num_stripes - 1); +} + void btrfs_get_bioc(struct btrfs_io_context *bioc); void btrfs_put_bioc(struct btrfs_io_context *bioc); int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, |