btrfs: use bool argument in free_root_pointers()
PATCH 1/1 btrfs: use bool argument in free_root_pointers()
We don't need int argument bool shall do in free_root_pointers(). And rename the argument as it confused two people.
Signed-off-by Anand Jain <[email protected]>
--- fs/btrfs/disk-io.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/disk-io.c +5 -5
@@ -2024,7 +2024,7 @@ static void free_root_extent_buffers(struct btrfs_root *root) }/* helper to cleanup tree roots */ -static void free_root_pointers (struct btrfs_fs_info *info,int chunk_root) +static void free_root_pointers (struct btrfs_fs_info *info,bool free_chunk_root) {free_root_extent_buffers (info->tree_root);
@@ -2033,7 +2033,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)free_root_extent_buffers (info->csum_root);free_root_extent_buffers (info->quota_root);free_root_extent_buffers (info->uuid_root); -if (chunk_root) +if (free_chunk_root)free_root_extent_buffers (info->chunk_root);free_root_extent_buffers (info->free_space_root); }
@@ -3327,7 +3327,7 @@ int __cold open_ctree(struct super_block *sb,btrfs_put_block_group_cache (fs_info); fail_tree_roots: -free_root_pointers (fs_info,1 ); +free_root_pointers (fs_info, true);invalidate_inode_pages2 (fs_info->btree_inode->i_mapping); fail_sb_buffer:
@@ -3359,7 +3359,7 @@ int __cold open_ctree(struct super_block *sb,if (!btrfs_test_opt (fs_info,USEBACKUPROOT )) goto fail_tree_roots; -free_root_pointers (fs_info,0 ); +free_root_pointers (fs_info, false);/* don't use the log in recovery mode, it won't be valid */ btrfs_set_super_log_root (disk_super,0 );
@@ -4053,7 +4053,7 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)btrfs_free_block_groups (fs_info);clear_bit (BTRFS_FS_OPEN , &fs_info->flags); -free_root_pointers (fs_info,1 ); +free_root_pointers (fs_info, true);iput (fs_info->btree_inode);
Signature · 1 line
2.23.0
Quoted 2 lines · Anand Jain
We don't need int argument bool shall do in
free_root_pointers(). And rename the argument as it confused two people.
Victim here. :)
Although it's mostly caused by my stupidness. :(
Quoted 2 lines
Signed-off-by Anand Jain <[email protected]>
Reviewed-by Qu Wenruo <[email protected]>
Thanks,
Qu
Quoted 54 lines
--- fs/btrfs/disk-io.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)fs/btrfs/disk-io.c +5
-5@@ -2024,7 +2024,7 @@ static void free_root_extent_buffers(struct btrfs_root *root) }/* helper to cleanup tree roots */ -static void free_root_pointers (struct btrfs_fs_info *info,int chunk_root) +static void free_root_pointers (struct btrfs_fs_info *info,bool free_chunk_root) {free_root_extent_buffers (info->tree_root);@@ -2033,7 +2033,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)free_root_extent_buffers (info->csum_root);free_root_extent_buffers (info->quota_root);free_root_extent_buffers (info->uuid_root); -if (chunk_root) +if (free_chunk_root)free_root_extent_buffers (info->chunk_root);free_root_extent_buffers (info->free_space_root); }@@ -3327,7 +3327,7 @@ int __cold open_ctree(struct super_block *sb,btrfs_put_block_group_cache (fs_info); fail_tree_roots: -free_root_pointers (fs_info,1 ); +free_root_pointers (fs_info, true);invalidate_inode_pages2 (fs_info->btree_inode->i_mapping); fail_sb_buffer:@@ -3359,7 +3359,7 @@ int __cold open_ctree(struct super_block *sb,if (!btrfs_test_opt (fs_info,USEBACKUPROOT )) goto fail_tree_roots; -free_root_pointers (fs_info,0 ); +free_root_pointers (fs_info, false);/* don't use the log in recovery mode, it won't be valid */ btrfs_set_super_log_root (disk_super,0 );@@ -4053,7 +4053,7 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)btrfs_free_block_groups (fs_info);clear_bit (BTRFS_FS_OPEN , &fs_info->flags); -free_root_pointers (fs_info,1 ); +free_root_pointers (fs_info, true);iput (fs_info->btree_inode);
Quoted 4 lines · Anand Jain
We don't need int argument bool shall do in
free_root_pointers(). And rename the argument as it confused two people.Signed-off-by Anand Jain <[email protected]>
Added to misc-next, thanks.