Commit 67e78f98 authored by David Sterba's avatar David Sterba
Browse files

btrfs: convert several int parameters to bool 



We're almost done cleaning misused int/bool parameters. Convert a bunch
of them, found by manual grepping.  Note that btrfs_sync_fs() needs an
int as it's mandated by the struct super_operations prototype.

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cba7c35f

fs/btrfs/block-group.c

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,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/btrfs_inode.h

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ int btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
		       const struct fscrypt_str *name);

int btrfs_add_link(struct btrfs_trans_handle *trans,

		   struct btrfs_inode *parent_inode, struct btrfs_inode *inode,

		   const struct fscrypt_str *name, int add_backref, u64 index);

		   const struct fscrypt_str *name, bool add_backref, u64 index);

int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry);

int btrfs_truncate_block(struct btrfs_inode *inode, u64 offset, u64 start, u64 end);

fs/btrfs/ctree.c

+8 −8
Original line number Diff line number Diff line
@@ -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);
@@ -1484,7 +1484,7 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p, 
			reada_for_search(fs_info, p, parent_level, slot, key->objectid);



		/* first we do an atomic uptodate check */

		if (btrfs_buffer_uptodate(tmp, check.transid, 1) > 0) {

		if (btrfs_buffer_uptodate(tmp, check.transid, true) > 0) {

			/*

			 * Do extra check for first_key, eb can be stale due to

			 * being cached, read from scrub, or have multiple
@@ -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/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void csum_tree_block(struct extent_buffer *buf, u8 *result) 
 * detect blocks that either didn't get written at all or got written

 * in the wrong place.

 */

int btrfs_buffer_uptodate(struct extent_buffer *eb, u64 parent_transid, int atomic)

int btrfs_buffer_uptodate(struct extent_buffer *eb, u64 parent_transid, bool atomic)

{

	if (!extent_buffer_uptodate(eb))

		return 0;
@@ -1047,7 +1047,7 @@ static struct btrfs_root *read_tree_root_path(struct btrfs_root *tree_root, 
		root->node = NULL;

		goto fail;

	}

	if (!btrfs_buffer_uptodate(root->node, generation, 0)) {

	if (!btrfs_buffer_uptodate(root->node, generation, false)) {

		ret = -EIO;

		goto fail;

	}

fs/btrfs/disk-io.h

+1 −2
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ static inline struct btrfs_root *btrfs_grab_root(struct btrfs_root *root) 
void btrfs_put_root(struct btrfs_root *root);

void btrfs_mark_buffer_dirty(struct btrfs_trans_handle *trans,

			     struct extent_buffer *buf);

int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,

			  int atomic);

int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid, bool atomic);

int btrfs_read_extent_buffer(struct extent_buffer *buf,

			     const struct btrfs_tree_parent_check *check);