summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilipe Manana <fdmanana@suse.com>2026-02-19 16:05:39 +0000
committerDavid Sterba <dsterba@suse.com>2026-04-07 18:56:00 +0200
commit01cebce71f2f90abe6a98d3066c085a34b95d96e (patch)
tree3b8901c2be150f1416a49ab9b212875bb90e2570
parent7aa1788ff09fba1db7d66b38a20051f0997b9cb9 (diff)
downloadlinux-01cebce71f2f90abe6a98d3066c085a34b95d96e.tar.gz
linux-01cebce71f2f90abe6a98d3066c085a34b95d96e.zip
btrfs: remove duplicated uuid tree existence check in btrfs_uuid_tree_add()
There's no point in checking if the uuid root exists in btrfs_uuid_tree_add(), since we already do it in btrfs_uuid_tree_lookup(). We can just remove the check from btrfs_uuid_tree_add() and make btrfs_uuid_tree_lookup() return -EINVAL instead of -ENOENT in case the uuid tree does not exists. Reviewed-by: Boris Burkov <boris@bur.io> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/uuid-tree.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c
index 43c17a1d3451..276f0eb874d4 100644
--- a/fs/btrfs/uuid-tree.c
+++ b/fs/btrfs/uuid-tree.c
@@ -35,7 +35,7 @@ static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, const u8 *uuid,
struct btrfs_key key;
if (WARN_ON_ONCE(!uuid_root))
- return -ENOENT;
+ return -EINVAL;
path = btrfs_alloc_path();
if (!path)
@@ -92,9 +92,6 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, const u8 *uuid, u8 typ
if (ret != -ENOENT)
return ret;
- if (WARN_ON_ONCE(!uuid_root))
- return -EINVAL;
-
btrfs_uuid_to_key(uuid, type, &key);
path = btrfs_alloc_path();