Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31945021 authored by Zhao Lei's avatar Zhao Lei Committed by David Sterba
Browse files

btrfs: reada: bypass adding extent when all zone failed 



When failed adding all dev_zones for a reada_extent, the extent
will have no chance to be selected to run, and keep in memory
for ever.

We should bypass this extent to avoid above case.

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6a159d2a

fs/btrfs/reada.c

+5 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, 
	int nzones = 0;

	unsigned long index = logical >> PAGE_CACHE_SHIFT;

	int dev_replace_is_ongoing;

	int have_zone = 0;



	spin_lock(&fs_info->reada_lock);

	re = radix_tree_lookup(&fs_info->reada_tree, index);
@@ -456,10 +457,14 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root, 
			btrfs_dev_replace_unlock(&fs_info->dev_replace);

			goto error;

		}

		have_zone = 1;

	}

	spin_unlock(&fs_info->reada_lock);

	btrfs_dev_replace_unlock(&fs_info->dev_replace);



	if (!have_zone)

		goto error;



	btrfs_put_bbio(bbio);

	return re;