Commit cb3450b7 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: raid56: extract scrub read bio list assembly code into a helper 



Just like what we did for write/recovery, also extract the read bio
assembly code into a helper for scrub.

The difference between the three are:

- rmw_assemble_read_bios() only submit reads for missing sectors
  Thus it will skip cached sectors, but will also read sectors which
  is not covered by any full stripe. (For cache usage)

- recover_assemble_read_bios() reads every sector which has not failed

- scrub_assemble_read_bios() has extra check for vertical stripes
  It's mostly the same as rmw_assemble_read_bios(), but will skip
  sectors which is not covered by a vertical stripe.

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 93723095

fs/btrfs/raid56.c

+31 −13
Original line number Diff line number Diff line
@@ -2707,21 +2707,15 @@ static void raid56_parity_scrub_end_io_work(struct work_struct *work) 
	validate_rbio_for_parity_scrub(rbio);

}



static void raid56_parity_scrub_stripe(struct btrfs_raid_bio *rbio)

static int scrub_assemble_read_bios(struct btrfs_raid_bio *rbio,

				    struct bio_list *bio_list)

{

	int bios_to_read = 0;

	struct bio_list bio_list;

	int ret;

	int total_sector_nr;

	struct bio *bio;

	int total_sector_nr;

	int ret = 0;



	bio_list_init(&bio_list);



	ret = alloc_rbio_essential_pages(rbio);

	if (ret)

		goto cleanup;

	ASSERT(bio_list_size(bio_list) == 0);



	atomic_set(&rbio->error, 0);

	/* Build a list of bios to read all the missing parts. */

	for (total_sector_nr = 0; total_sector_nr < rbio->nr_sectors;

	     total_sector_nr++) {
@@ -2750,11 +2744,35 @@ static void raid56_parity_scrub_stripe(struct btrfs_raid_bio *rbio) 
		if (sector->uptodate)

			continue;



		ret = rbio_add_io_sector(rbio, &bio_list, sector, stripe,

		ret = rbio_add_io_sector(rbio, bio_list, sector, stripe,

					 sectornr, REQ_OP_READ);

		if (ret)

			goto cleanup;

			goto error;

	}

	return 0;

error:

	while ((bio = bio_list_pop(bio_list)))

		bio_put(bio);

	return ret;

}



static void raid56_parity_scrub_stripe(struct btrfs_raid_bio *rbio)

{

	int bios_to_read = 0;

	struct bio_list bio_list;

	int ret;

	struct bio *bio;



	bio_list_init(&bio_list);



	ret = alloc_rbio_essential_pages(rbio);

	if (ret)

		goto cleanup;



	atomic_set(&rbio->error, 0);

	ret = scrub_assemble_read_bios(rbio, &bio_list);

	if (ret < 0)

		goto cleanup;



	bios_to_read = bio_list_size(&bio_list);

	if (!bios_to_read) {