diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2017-06-13 17:19:19 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-07-12 17:52:37 +0200 |
| commit | 824a300ec8e984281acf4a8d8fc04eeb06c06d9d (patch) | |
| tree | 3eabd3402281bb3755e323e2a34c0813f230aa88 | |
| parent | a30579b1a7a73dd547330d4bfade3bee64145ef5 (diff) | |
btrfs-progs: Refactor btrfs_next_bg and its callers to use btrfs_fs_info
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | find-root.c | 4 | ||||
| -rw-r--r-- | volumes.c | 5 | ||||
| -rw-r--r-- | volumes.h | 14 |
3 files changed, 12 insertions, 11 deletions
diff --git a/find-root.c b/find-root.c index 1b41b217..1765adf8 100644 --- a/find-root.c +++ b/find-root.c @@ -118,11 +118,11 @@ int btrfs_find_root_search(struct btrfs_fs_info *fs_info, fs_info->suppress_check_block_errors = 1; while (1) { if (filter->objectid != BTRFS_CHUNK_TREE_OBJECTID) - ret = btrfs_next_bg_metadata(&fs_info->mapping_tree, + ret = btrfs_next_bg_metadata(fs_info, &chunk_offset, &chunk_size); else - ret = btrfs_next_bg_system(&fs_info->mapping_tree, + ret = btrfs_next_bg_system(fs_info, &chunk_offset, &chunk_size); if (ret) { @@ -1252,9 +1252,10 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) return ret; } -int btrfs_next_bg(struct btrfs_mapping_tree *map_tree, u64 *logical, - u64 *size, u64 type) +int btrfs_next_bg(struct btrfs_fs_info *fs_info, u64 *logical, + u64 *size, u64 type) { + struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree; struct cache_extent *ce; struct map_lookup *map; u64 cur = *logical; @@ -187,18 +187,18 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, u64 logical, u64 *length, struct btrfs_multi_bio **multi_ret, int mirror_num, u64 **raid_map_ret); -int btrfs_next_bg(struct btrfs_mapping_tree *map_tree, u64 *logical, +int btrfs_next_bg(struct btrfs_fs_info *map_tree, u64 *logical, u64 *size, u64 type); -static inline int btrfs_next_bg_metadata(struct btrfs_mapping_tree *map_tree, - u64 *logical, u64 *size) +static inline int btrfs_next_bg_metadata(struct btrfs_fs_info *fs_info, + u64 *logical, u64 *size) { - return btrfs_next_bg(map_tree, logical, size, + return btrfs_next_bg(fs_info, logical, size, BTRFS_BLOCK_GROUP_METADATA); } -static inline int btrfs_next_bg_system(struct btrfs_mapping_tree *map_tree, - u64 *logical, u64 *size) +static inline int btrfs_next_bg_system(struct btrfs_fs_info *fs_info, + u64 *logical, u64 *size) { - return btrfs_next_bg(map_tree, logical, size, + return btrfs_next_bg(fs_info, logical, size, BTRFS_BLOCK_GROUP_SYSTEM); } int btrfs_rmap_block(struct btrfs_fs_info *fs_info, |