Commit 61c681fe authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: use bool type for delayed ref head fields that are used as booleans 



There's no point in have several fields defined as 1 bit unsigned int in
struct btrfs_delayed_ref_head, we can instead use a bool type, it makes
the code a bit more readable and it doesn't change the structure size.
So switch them to proper booleans.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1e6b71c3

fs/btrfs/delayed-ref.c

+6 −6
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ struct btrfs_delayed_ref_head *btrfs_select_ref_head( 
				href_node);

	}



	head->processing = 1;

	head->processing = true;

	WARN_ON(delayed_refs->num_heads_ready == 0);

	delayed_refs->num_heads_ready--;

	delayed_refs->run_delayed_start = head->bytenr +
@@ -549,7 +549,7 @@ void btrfs_delete_ref_head(struct btrfs_delayed_ref_root *delayed_refs, 
	RB_CLEAR_NODE(&head->href_node);

	atomic_dec(&delayed_refs->num_entries);

	delayed_refs->num_heads--;

	if (head->processing == 0)

	if (!head->processing)

		delayed_refs->num_heads_ready--;

}
@@ -697,7 +697,7 @@ static void init_delayed_ref_head(struct btrfs_delayed_ref_head *head_ref, 
				  bool is_system)

{

	int count_mod = 1;

	int must_insert_reserved = 0;

	bool must_insert_reserved = false;



	/* If reserved is provided, it must be a data extent. */

	BUG_ON(!is_data && reserved);
@@ -722,9 +722,9 @@ static void init_delayed_ref_head(struct btrfs_delayed_ref_head *head_ref, 
	 * BTRFS_ADD_DELAYED_REF because other special casing is not required.

	 */

	if (action == BTRFS_ADD_DELAYED_EXTENT)

		must_insert_reserved = 1;

		must_insert_reserved = true;

	else

		must_insert_reserved = 0;

		must_insert_reserved = false;



	refcount_set(&head_ref->refs, 1);

	head_ref->bytenr = bytenr;
@@ -736,7 +736,7 @@ static void init_delayed_ref_head(struct btrfs_delayed_ref_head *head_ref, 
	head_ref->ref_tree = RB_ROOT_CACHED;

	INIT_LIST_HEAD(&head_ref->ref_add_list);

	RB_CLEAR_NODE(&head_ref->href_node);

	head_ref->processing = 0;

	head_ref->processing = false;

	head_ref->total_ref_mod = count_mod;

	spin_lock_init(&head_ref->lock);

	mutex_init(&head_ref->mutex);

fs/btrfs/delayed-ref.h

+4 −4
Original line number Diff line number Diff line
@@ -116,10 +116,10 @@ struct btrfs_delayed_ref_head { 
	 * we need to update the in ram accounting to properly reflect

	 * the free has happened.

	 */

	unsigned int must_insert_reserved:1;

	unsigned int is_data:1;

	unsigned int is_system:1;

	unsigned int processing:1;

	bool must_insert_reserved;

	bool is_data;

	bool is_system;

	bool processing;

};



struct btrfs_delayed_tree_ref {

fs/btrfs/extent-tree.c

+7 −7
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
static int run_delayed_data_ref(struct btrfs_trans_handle *trans,

				struct btrfs_delayed_ref_node *node,

				struct btrfs_delayed_extent_op *extent_op,

				int insert_reserved)

				bool insert_reserved)

{

	int ret = 0;

	struct btrfs_delayed_data_ref *ref;
@@ -1647,7 +1647,7 @@ static int run_delayed_extent_op(struct btrfs_trans_handle *trans, 
static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,

				struct btrfs_delayed_ref_node *node,

				struct btrfs_delayed_extent_op *extent_op,

				int insert_reserved)

				bool insert_reserved)

{

	int ret = 0;

	struct btrfs_delayed_tree_ref *ref;
@@ -1687,7 +1687,7 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans, 
static int run_one_delayed_ref(struct btrfs_trans_handle *trans,

			       struct btrfs_delayed_ref_node *node,

			       struct btrfs_delayed_extent_op *extent_op,

			       int insert_reserved)

			       bool insert_reserved)

{

	int ret = 0;
@@ -1745,7 +1745,7 @@ static void unselect_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_ref 
				      struct btrfs_delayed_ref_head *head)

{

	spin_lock(&delayed_refs->lock);

	head->processing = 0;

	head->processing = false;

	delayed_refs->num_heads_ready++;

	spin_unlock(&delayed_refs->lock);

	btrfs_delayed_ref_unlock(head);
@@ -1897,7 +1897,7 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans, 
	struct btrfs_delayed_ref_root *delayed_refs;

	struct btrfs_delayed_extent_op *extent_op;

	struct btrfs_delayed_ref_node *ref;

	int must_insert_reserved = 0;

	bool must_insert_reserved;

	int ret;



	delayed_refs = &trans->transaction->delayed_refs;
@@ -1939,7 +1939,7 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans, 
		 * spin lock.

		 */

		must_insert_reserved = locked_ref->must_insert_reserved;

		locked_ref->must_insert_reserved = 0;

		locked_ref->must_insert_reserved = false;



		extent_op = locked_ref->extent_op;

		locked_ref->extent_op = NULL;
@@ -3211,7 +3211,7 @@ static noinline int check_ref_cleanup(struct btrfs_trans_handle *trans, 
		goto out;



	btrfs_delete_ref_head(delayed_refs, head);

	head->processing = 0;

	head->processing = false;



	spin_unlock(&head->lock);

	spin_unlock(&delayed_refs->lock);