Commit 7ef36048 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: change return type of btrfs_delayed_ref_lock() to boolean 



The function only returns 0, meaning it was able to lock the delayed ref
head, or -EAGAIN in case it wasn't able to lock it. So simplify this and
use a boolean return type instead, returning true if it was able to lock
and false otherwise.

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
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 f7d4b492

fs/btrfs/delayed-ref.c

+6 −6
Original line number Diff line number Diff line
@@ -431,12 +431,12 @@ static struct btrfs_delayed_ref_head *find_ref_head( 
	return NULL;

}



int btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs,

bool btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs,

			    struct btrfs_delayed_ref_head *head)

{

	lockdep_assert_held(&delayed_refs->lock);

	if (mutex_trylock(&head->mutex))

		return 0;

		return true;



	refcount_inc(&head->refs);

	spin_unlock(&delayed_refs->lock);
@@ -446,10 +446,10 @@ int btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs, 
	if (RB_EMPTY_NODE(&head->href_node)) {

		mutex_unlock(&head->mutex);

		btrfs_put_delayed_ref_head(head);

		return -EAGAIN;

		return false;

	}

	btrfs_put_delayed_ref_head(head);

	return 0;

	return true;

}



static inline void drop_delayed_ref(struct btrfs_fs_info *fs_info,
@@ -1250,7 +1250,7 @@ void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans) 
		if (!head)

			break;



		if (btrfs_delayed_ref_lock(delayed_refs, head))

		if (!btrfs_delayed_ref_lock(delayed_refs, head))

			continue;



		spin_lock(&head->lock);

fs/btrfs/delayed-ref.h

+2 −2
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ void btrfs_merge_delayed_refs(struct btrfs_fs_info *fs_info, 
struct btrfs_delayed_ref_head *

btrfs_find_delayed_ref_head(struct btrfs_delayed_ref_root *delayed_refs,

			    u64 bytenr);

int btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs,

bool btrfs_delayed_ref_lock(struct btrfs_delayed_ref_root *delayed_refs,

			    struct btrfs_delayed_ref_head *head);

static inline void btrfs_delayed_ref_unlock(struct btrfs_delayed_ref_head *head)

{

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -1959,7 +1959,7 @@ static struct btrfs_delayed_ref_head *btrfs_obtain_ref_head( 
	struct btrfs_delayed_ref_root *delayed_refs =

		&trans->transaction->delayed_refs;

	struct btrfs_delayed_ref_head *head = NULL;

	int ret;

	bool locked;



	spin_lock(&delayed_refs->lock);

	head = btrfs_select_ref_head(delayed_refs);
@@ -1972,7 +1972,7 @@ static struct btrfs_delayed_ref_head *btrfs_obtain_ref_head( 
	 * Grab the lock that says we are going to process all the refs for

	 * this head

	 */

	ret = btrfs_delayed_ref_lock(delayed_refs, head);

	locked = btrfs_delayed_ref_lock(delayed_refs, head);

	spin_unlock(&delayed_refs->lock);



	/*
@@ -1980,7 +1980,7 @@ static struct btrfs_delayed_ref_head *btrfs_obtain_ref_head( 
	 * that might have given someone else time to free the head.  If that's

	 * true, it has been removed from our list and we can move on.

	 */

	if (ret == -EAGAIN)

	if (!locked)

		head = ERR_PTR(-EAGAIN);



	return head;