From: Filipe Manana <fdmanana@suse.com>
Date: Fri, 27 Feb 2026 00:05:08 +0000 (+0000)
Subject: btrfs: remove unnecessary transaction abort in the received subvol ioctl
X-Git-Tag: v7.0-rc4~36^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dd0e6807b54a2411ed7263018139c60d1406e39;p=thirdparty%2Fkernel%2Flinux.git

btrfs: remove unnecessary transaction abort in the received subvol ioctl

If we fail to remove an item from the uuid tree, we don't need to abort
the transaction since we have not done any change before. So remove that
transaction abort.

Reviewed-by: Anand Jain <asj@kernel.org>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 5805ac2078f2c..7d86e9c8909ec 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3969,7 +3969,6 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
 					  BTRFS_UUID_KEY_RECEIVED_SUBVOL,
 					  btrfs_root_id(root));
 		if (unlikely(ret && ret != -ENOENT)) {
-		        btrfs_abort_transaction(trans, ret);
 		        btrfs_end_transaction(trans);
 		        goto out;
 		}