Skip to content

Commit 5c365c8

Browse files
fdmananakdave
authored andcommitted
btrfs: make btrfs_delete_delayed_insertion_item() return a boolean
There's no need to return an integer as all we need to do is return true or false to tell whether we deleted a delayed item or not. Also the logic is inverted since we return 1 (true) if we didn't delete and 0 (false) if we did, which is somewhat counter intuitive. Change the return type to a boolean and make it return true if we deleted and false otherwise. Reviewed-by: Boris Burkov <boris@bur.io> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 939a9f2 commit 5c365c8

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

fs/btrfs/delayed-inode.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,16 +1540,16 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
15401540
return ret;
15411541
}
15421542

1543-
static int btrfs_delete_delayed_insertion_item(struct btrfs_delayed_node *node,
1544-
u64 index)
1543+
static bool btrfs_delete_delayed_insertion_item(struct btrfs_delayed_node *node,
1544+
u64 index)
15451545
{
15461546
struct btrfs_delayed_item *item;
15471547

15481548
mutex_lock(&node->mutex);
15491549
item = __btrfs_lookup_delayed_item(&node->ins_root.rb_root, index);
15501550
if (!item) {
15511551
mutex_unlock(&node->mutex);
1552-
return 1;
1552+
return false;
15531553
}
15541554

15551555
/*
@@ -1584,7 +1584,7 @@ static int btrfs_delete_delayed_insertion_item(struct btrfs_delayed_node *node,
15841584
}
15851585

15861586
mutex_unlock(&node->mutex);
1587-
return 0;
1587+
return true;
15881588
}
15891589

15901590
int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,
@@ -1598,9 +1598,10 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,
15981598
if (IS_ERR(node))
15991599
return PTR_ERR(node);
16001600

1601-
ret = btrfs_delete_delayed_insertion_item(node, index);
1602-
if (!ret)
1601+
if (btrfs_delete_delayed_insertion_item(node, index)) {
1602+
ret = 0;
16031603
goto end;
1604+
}
16041605

16051606
item = btrfs_alloc_delayed_item(0, node, BTRFS_DELAYED_DELETION_ITEM);
16061607
if (!item) {

0 commit comments

Comments
 (0)