Commit 874576d2 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: return real error from read_alloc_one_name() in drop_one_dir_item() 



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: default avatarBoris Burkov <boris@bur.io>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 425652cf

fs/btrfs/tree-log.c

+1 −1
Original line number Diff line number Diff line
@@ -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);