From: Filipe Manana <fdmanana@suse.com>
Date: Tue, 13 Jan 2026 16:39:00 +0000 (+0000)
Subject: btrfs: remove unnecessary else branch in run_one_delayed_ref()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=271cbe76354e83e56f8d81acad2dba1adb17a896;p=thirdparty%2Fkernel%2Flinux.git

btrfs: remove unnecessary else branch in run_one_delayed_ref()

There is no need for an else branch to deal with an unexpected delayed ref
type. We can just change the previous branch to deal with this by checking
if the ref type is not BTRFS_EXTENT_OWNER_REF_KEY, since that branch is
useless as it only sets 'ret' to zero when it's already zero. So merge the
two branches.

Reviewed-by: Boris Burkov <boris@bur.io>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 57ffe9b3b954d..b3a26b61f9373 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1780,9 +1780,7 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans,
 		   node->type == BTRFS_SHARED_DATA_REF_KEY) {
 		ret = run_delayed_data_ref(trans, href, node, extent_op,
 					   insert_reserved);
-	} else if (node->type == BTRFS_EXTENT_OWNER_REF_KEY) {
-		ret = 0;
-	} else {
+	} else if (unlikely(node->type != BTRFS_EXTENT_OWNER_REF_KEY)) {
 		ret = -EUCLEAN;
 		btrfs_err(fs_info, "unexpected delayed ref node type: %u", node->type);
 	}