Commit 798f4d95 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: get rid of label and goto at insert_delayed_ref()

At insert_delayed_ref() there's no point of having a label and goto in the
case we were able to insert the delayed ref head. We can just add the code
under label to the if statement's body and return immediately, and also
there is no need to track the return value in a variable, we can just
return a literal true or false value directly. So do those changes.
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 f38462c4
...@@ -565,15 +565,18 @@ static bool insert_delayed_ref(struct btrfs_delayed_ref_root *root, ...@@ -565,15 +565,18 @@ static bool insert_delayed_ref(struct btrfs_delayed_ref_root *root,
{ {
struct btrfs_delayed_ref_node *exist; struct btrfs_delayed_ref_node *exist;
int mod; int mod;
bool ret = false;
spin_lock(&href->lock); spin_lock(&href->lock);
exist = tree_insert(&href->ref_tree, ref); exist = tree_insert(&href->ref_tree, ref);
if (!exist) if (!exist) {
goto inserted; if (ref->action == BTRFS_ADD_DELAYED_REF)
list_add_tail(&ref->add_list, &href->ref_add_list);
atomic_inc(&root->num_entries);
spin_unlock(&href->lock);
return false;
}
/* Now we are sure we can merge */ /* Now we are sure we can merge */
ret = true;
if (exist->action == ref->action) { if (exist->action == ref->action) {
mod = ref->ref_mod; mod = ref->ref_mod;
} else { } else {
...@@ -600,13 +603,7 @@ static bool insert_delayed_ref(struct btrfs_delayed_ref_root *root, ...@@ -600,13 +603,7 @@ static bool insert_delayed_ref(struct btrfs_delayed_ref_root *root,
if (exist->ref_mod == 0) if (exist->ref_mod == 0)
drop_delayed_ref(root, href, exist); drop_delayed_ref(root, href, exist);
spin_unlock(&href->lock); spin_unlock(&href->lock);
return ret; return true;
inserted:
if (ref->action == BTRFS_ADD_DELAYED_REF)
list_add_tail(&ref->add_list, &href->ref_add_list);
atomic_inc(&root->num_entries);
spin_unlock(&href->lock);
return ret;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment