Commit d23d42e3 authored by David Sterba's avatar David Sterba

btrfs: relocation: switch bitfields to bool in reloc_control

Use bool types for the indicators instead of bitfields. The structure
size slightly grows but the new types are placed within the padding.
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8daf07cf
...@@ -163,9 +163,9 @@ struct reloc_control { ...@@ -163,9 +163,9 @@ struct reloc_control {
u64 extents_found; u64 extents_found;
enum reloc_stage stage; enum reloc_stage stage;
unsigned int create_reloc_tree:1; bool create_reloc_tree;
unsigned int merge_reloc_tree:1; bool merge_reloc_tree;
unsigned int found_file_extent:1; bool found_file_extent;
}; };
static void mark_block_processed(struct reloc_control *rc, static void mark_block_processed(struct reloc_control *rc,
...@@ -1902,7 +1902,7 @@ int prepare_to_merge(struct reloc_control *rc, int err) ...@@ -1902,7 +1902,7 @@ int prepare_to_merge(struct reloc_control *rc, int err)
} }
} }
rc->merge_reloc_tree = 1; rc->merge_reloc_tree = true;
while (!list_empty(&rc->reloc_roots)) { while (!list_empty(&rc->reloc_roots)) {
reloc_root = list_entry(rc->reloc_roots.next, reloc_root = list_entry(rc->reloc_roots.next,
...@@ -3659,7 +3659,7 @@ int prepare_to_relocate(struct reloc_control *rc) ...@@ -3659,7 +3659,7 @@ int prepare_to_relocate(struct reloc_control *rc)
if (ret) if (ret)
return ret; return ret;
rc->create_reloc_tree = 1; rc->create_reloc_tree = true;
set_reloc_control(rc); set_reloc_control(rc);
trans = btrfs_join_transaction(rc->extent_root); trans = btrfs_join_transaction(rc->extent_root);
...@@ -3786,7 +3786,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) ...@@ -3786,7 +3786,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
if (rc->stage == MOVE_DATA_EXTENTS && if (rc->stage == MOVE_DATA_EXTENTS &&
(flags & BTRFS_EXTENT_FLAG_DATA)) { (flags & BTRFS_EXTENT_FLAG_DATA)) {
rc->found_file_extent = 1; rc->found_file_extent = true;
ret = relocate_data_extent(rc->data_inode, ret = relocate_data_extent(rc->data_inode,
&key, &rc->cluster); &key, &rc->cluster);
if (ret < 0) { if (ret < 0) {
...@@ -3823,7 +3823,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) ...@@ -3823,7 +3823,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
err = ret; err = ret;
} }
rc->create_reloc_tree = 0; rc->create_reloc_tree = false;
set_reloc_control(rc); set_reloc_control(rc);
btrfs_backref_release_cache(&rc->backref_cache); btrfs_backref_release_cache(&rc->backref_cache);
...@@ -3841,7 +3841,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) ...@@ -3841,7 +3841,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
merge_reloc_roots(rc); merge_reloc_roots(rc);
rc->merge_reloc_tree = 0; rc->merge_reloc_tree = false;
unset_reloc_control(rc); unset_reloc_control(rc);
btrfs_block_rsv_release(fs_info, rc->block_rsv, (u64)-1, NULL); btrfs_block_rsv_release(fs_info, rc->block_rsv, (u64)-1, NULL);
...@@ -4355,7 +4355,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info) ...@@ -4355,7 +4355,7 @@ int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)
goto out_unset; goto out_unset;
} }
rc->merge_reloc_tree = 1; rc->merge_reloc_tree = true;
while (!list_empty(&reloc_roots)) { while (!list_empty(&reloc_roots)) {
reloc_root = list_entry(reloc_roots.next, reloc_root = list_entry(reloc_roots.next,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment