btrfs: convert several int parameters to bool
David Sterba
maintainerPATCH 1/1 btrfs: convert several int parameters to bool
We're almost done cleaning the misused int/bool parameters. Convert a few of them, found by manual grepping as we don't have a tool for that. Note that btrfs_sync_fs() needs an int as it' mandated by the struct super_operations prototype.
--- fs/btrfs/block-group.c | 2 +- fs/btrfs/ctree.c | 14 +++++++------- fs/btrfs/extent-io-tree.c | 2 +- fs/btrfs/extent-io-tree.h | 2 +- fs/btrfs/scrub.c | 6 +++--- fs/btrfs/scrub.h | 2 +- fs/btrfs/transaction.c | 2 +- fs/btrfs/volumes.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-)
fs/btrfs/block-group.c +1 -1
@@ -1336,7 +1336,7 @@ struct btrfs_trans_handle *btrfs_start_trans_remove_block_group(* data in this block group. That check should be done by relocation routine, * not this function. */ -static int inc_block_group_ro (struct btrfs_block_group *cache,int force) +static int inc_block_group_ro (struct btrfs_block_group *cache,bool force) {struct btrfs_space_info *sinfo = cache->space_info;u64 num_bytes;
fs/btrfs/ctree.c +7 -7
@@ -30,10 +30,10 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, int level);static int split_leaf (struct btrfs_trans_handle *trans,struct btrfs_root *root,const struct btrfs_key *ins_key,struct btrfs_path *path, -int data_size,int extend); +int data_size,bool extend);static int push_node_left (struct btrfs_trans_handle *trans,struct extent_buffer *dst, -struct extent_buffer *src,int empty); +struct extent_buffer *src,bool empty);static int balance_node_right (struct btrfs_trans_handle *trans,struct extent_buffer *dst_buf,struct extent_buffer *src_buf);
@@ -2686,7 +2686,7 @@ static bool check_sibling_keys(const struct extent_buffer *left,*/ static int push_node_left (struct btrfs_trans_handle *trans,struct extent_buffer *dst, -struct extent_buffer *src,int empty) +struct extent_buffer *src,bool empty) {struct btrfs_fs_info *fs_info = trans->fs_info;int push_items =0 ;
@@ -3102,7 +3102,7 @@ int btrfs_leaf_free_space(const struct extent_buffer *leaf)*/ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,struct btrfs_path *path, -int data_size,int empty, +int data_size,bool empty,struct extent_buffer *right,int free_space,u32 left_nritems,u32 min_slot)
@@ -3239,7 +3239,7 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,static int push_leaf_right (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct btrfs_path *path,int min_data_size,int data_size, -int empty,u32 min_slot) +bool empty,u32 min_slot) {struct extent_buffer *left = path->nodes[0 ];struct extent_buffer *right;
@@ -3316,7 +3316,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root*/ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,struct btrfs_path *path,int data_size, -int empty,struct extent_buffer *left, +bool empty,struct extent_buffer *left,int free_space,u32 right_nritems,u32 max_slot) {
@@ -3642,7 +3642,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,struct btrfs_root *root, const struct btrfs_key *ins_key, struct btrfs_path *path, int data_size, - int extend) + bool extend) { struct btrfs_disk_key disk_key;struct extent_buffer *l;
fs/btrfs/extent-io-tree.c +1 -1
@@ -1664,7 +1664,7 @@ void btrfs_find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start,*/ u64 btrfs_count_range_bits (struct extent_io_tree *tree,u64 *start,u64 search_end,u64 max_bytes, -u32 bits,int contig, +u32 bits,bool contig,struct extent_state **cached_state) {struct extent_state *state =NULL ;
fs/btrfs/extent-io-tree.h +1 -1
@@ -163,7 +163,7 @@ void __cold btrfs_extent_state_free_cachep(void);u64 btrfs_count_range_bits (struct extent_io_tree *tree,u64 *start,u64 search_end, -u64 max_bytes,u32 bits,int contig, +u64 max_bytes,u32 bits,bool contig,struct extent_state **cached_state);void btrfs_free_extent_state (struct extent_state *state);
fs/btrfs/scrub.c +3 -3
@@ -206,7 +206,7 @@ struct scrub_ctx {ktime_t throttle_deadline;u64 throttle_sent; -int is_dev_replace; +bool is_dev_replace;u64 write_pointer;struct mutex wr_lock;
@@ -446,7 +446,7 @@ static void scrub_put_ctx(struct scrub_ctx *sctx) } static noinline_for_stack struct scrub_ctx *scrub_setup_ctx( -struct btrfs_fs_info *fs_info,int is_dev_replace) +struct btrfs_fs_info *fs_info,bool is_dev_replace) {struct scrub_ctx *sctx;int i;
@@ -3013,7 +3013,7 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info)int btrfs_scrub_dev (struct btrfs_fs_info *fs_info,u64 devid,u64 start,u64 end,struct btrfs_scrub_progress *progress, -int readonly,int is_dev_replace) +bool readonly,bool is_dev_replace) {struct btrfs_dev_lookup_args args = { .devid = devid };struct scrub_ctx *sctx;
fs/btrfs/scrub.h +1 -1
@@ -11,7 +11,7 @@ struct btrfs_scrub_progress;int btrfs_scrub_dev (struct btrfs_fs_info *fs_info,u64 devid,u64 start,u64 end,struct btrfs_scrub_progress *progress, -int readonly,int is_dev_replace); +bool readonly,bool is_dev_replace);void btrfs_scrub_pause (struct btrfs_fs_info *fs_info);void btrfs_scrub_continue (struct btrfs_fs_info *fs_info);int btrfs_scrub_cancel (struct btrfs_fs_info *info);
fs/btrfs/transaction.c +1 -1
@@ -404,7 +404,7 @@ static noinline int join_transaction(struct btrfs_fs_info *fs_info,*/ static int record_root_in_trans (struct btrfs_trans_handle *trans,struct btrfs_root *root, -int force) +bool force) {struct btrfs_fs_info *fs_info = root->fs_info;int ret =0 ;
fs/btrfs/volumes.c +1 -1
@@ -4262,7 +4262,7 @@ static int __btrfs_balance(struct btrfs_fs_info *fs_info)* @flags: profile to validate * @extended: if true @flags is treated as an extended profile */ -static int alloc_profile_is_valid (u64 flags,int extended) +static int alloc_profile_is_valid (u64 flags,bool extended) {u64 mask = (extended ?BTRFS_EXTENDED_PROFILE_MASK :BTRFS_BLOCK_GROUP_PROFILE_MASK );
Signature · 1 line
2.49.0
Quoted 4 lines · David Sterba
We're almost done cleaning the misused int/bool parameters. Convert a few of them, found by manual grepping as we don't have a tool for that. Note that
btrfs_sync_fs()needs an int as it' mandated by the structsuper_operationsprototype.
And with a bit more refined seach I found way more:
17 files changed, 56 insertions(+), 63 deletions(-)
I'll probably do another pass once we'll code freeze for 6.17 so there are no conflicts with any pending patches.
Quoted 6 lines · David Sterba
Quoted 4 lines · David Sterba
We're almost done cleaning the misused int/bool parameters. Convert a few of them, found by manual grepping as we don't have a tool for that. Note that
btrfs_sync_fs()needs an int as it' mandated by the structsuper_operationsprototype.
Quoted 8 lines
And with a bit more refined seach I found way more:
17 files changed, 56 insertions(+), 63 deletions(-)I'll probably do another pass once we'll code freeze for 6.17 so there are no conflicts with any pending patches.
Yeah this sounds like a good plan. 1st commit of the new cycle.