marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
master
Qu Wenruo 2017-06-13 17:19:19 +08:00 committed by David Sterba
parent a30579b1a7
commit 824a300ec8
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
find-root.c
View File

@ -118,11 +118,11 @@ int btrfs_find_root_search(struct btrfs_fs_info *fs_info,
fs_info->suppress_check_block_errors = 1; fs_info->suppress_check_block_errors = 1;
while (1) { while (1) {
if (filter->objectid != BTRFS_CHUNK_TREE_OBJECTID) 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_offset,
&chunk_size); &chunk_size);
else else
ret = btrfs_next_bg_system(&fs_info->mapping_tree, ret = btrfs_next_bg_system(fs_info,
&chunk_offset, &chunk_offset,
&chunk_size); &chunk_size);
if (ret) { if (ret) {

5
volumes.c
View File

@ -1252,9 +1252,10 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)
return ret; return ret;
} }
int btrfs_next_bg(struct btrfs_mapping_tree *map_tree, u64 *logical, int btrfs_next_bg(struct btrfs_fs_info *fs_info, u64 *logical,
u64 *size, u64 type) u64 *size, u64 type)
{ {
struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree;
struct cache_extent *ce; struct cache_extent *ce;
struct map_lookup *map; struct map_lookup *map;
u64 cur = *logical; u64 cur = *logical;

14
volumes.h
View File

@ -187,18 +187,18 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
u64 logical, u64 *length, u64 logical, u64 *length,
struct btrfs_multi_bio **multi_ret, int mirror_num, struct btrfs_multi_bio **multi_ret, int mirror_num,
u64 **raid_map_ret); 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); u64 *size, u64 type);
static inline int btrfs_next_bg_metadata(struct btrfs_mapping_tree *map_tree, static inline int btrfs_next_bg_metadata(struct btrfs_fs_info *fs_info,
u64 *logical, u64 *size) u64 *logical, u64 *size)
{ {
return btrfs_next_bg(map_tree, logical, size, return btrfs_next_bg(fs_info, logical, size,
BTRFS_BLOCK_GROUP_METADATA); BTRFS_BLOCK_GROUP_METADATA);
} }
static inline int btrfs_next_bg_system(struct btrfs_mapping_tree *map_tree, static inline int btrfs_next_bg_system(struct btrfs_fs_info *fs_info,
u64 *logical, u64 *size) u64 *logical, u64 *size)
{ {
return btrfs_next_bg(map_tree, logical, size, return btrfs_next_bg(fs_info, logical, size,
BTRFS_BLOCK_GROUP_SYSTEM); BTRFS_BLOCK_GROUP_SYSTEM);
} }
int btrfs_rmap_block(struct btrfs_fs_info *fs_info, int btrfs_rmap_block(struct btrfs_fs_info *fs_info,