]> www.infradead.org Git - users/hch/misc.git/commitdiff
btrfs: return real error from read_alloc_one_name() in drop_one_dir_item()
authorFilipe Manana <fdmanana@suse.com>
Wed, 16 Jul 2025 16:36:13 +0000 (17:36 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 22 Sep 2025 08:54:29 +0000 (10:54 +0200)
If read_alloc_one_name() we explicitly return -ENOMEM and currently that
is fine since it's the only error read_alloc_one_name() can return for
now. However this is fragile and not future proof, so return instead what
read_alloc_one_name() returned.

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>
fs/btrfs/tree-log.c

index bb8d4d1a30ef091d4a73f0a383a4e33796419715..a4068be25996bba8d13922c0c9d62755c1f39b19 100644 (file)
@@ -943,7 +943,7 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans,
        btrfs_dir_item_key_to_cpu(leaf, di, &location);
        ret = read_alloc_one_name(leaf, di + 1, btrfs_dir_name_len(leaf, di), &name);
        if (ret)
-               return -ENOMEM;
+               return ret;
 
        btrfs_release_path(path);