| From eacd6d8aac098f0e2f49d6b7fc8b9f0f69021c44 Mon Sep 17 00:00:00 2001 |
| From: Anand Jain <anand.jain@oracle.com> |
| Date: Thu, 10 Oct 2019 10:39:25 +0800 |
| Subject: [PATCH] btrfs: use bool argument in free_root_pointers() |
| |
| commit 4273eaff9b8d5e141113a5bdf9628c02acf3afe5 upstream. |
| |
| We don't need int argument bool shall do in free_root_pointers(). And |
| rename the argument as it confused two people. |
| |
| Reviewed-by: Qu Wenruo <wqu@suse.com> |
| Signed-off-by: Anand Jain <anand.jain@oracle.com> |
| Reviewed-by: David Sterba <dsterba@suse.com> |
| Signed-off-by: David Sterba <dsterba@suse.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c |
| index f6a9eef07c1e..3feddd97e0c5 100644 |
| --- a/fs/btrfs/disk-io.c |
| +++ b/fs/btrfs/disk-io.c |
| @@ -2052,7 +2052,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); |
| |
| @@ -2061,7 +2061,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); |
| } |
| @@ -3316,7 +3316,7 @@ int 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: |
| @@ -3346,7 +3346,7 @@ int 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); |
| @@ -4037,7 +4037,7 @@ void 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); |
| |
| -- |
| 2.7.4 |
| |
