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

Commit 2aabaa65 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

raid1: use bio_reset() 



Signed-off-by: default avatarKent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: NeilBrown <neilb@suse.de>
parent 8be185f2

drivers/md/raid1.c

+6 −18
Original line number Diff line number Diff line
@@ -1862,7 +1862,7 @@ static int process_checks(struct r1bio *r1_bio) 
		struct bio *sbio = r1_bio->bios[i];

		int size;



		if (r1_bio->bios[i]->bi_end_io != end_sync_read)

		if (sbio->bi_end_io != end_sync_read)

			continue;



		if (test_bit(BIO_UPTODATE, &sbio->bi_flags)) {
@@ -1887,16 +1887,15 @@ static int process_checks(struct r1bio *r1_bio) 
			continue;

		}

		/* fixup the bio for reuse */

		bio_reset(sbio);

		sbio->bi_vcnt = vcnt;

		sbio->bi_size = r1_bio->sectors << 9;

		sbio->bi_idx = 0;

		sbio->bi_phys_segments = 0;

		sbio->bi_flags &= ~(BIO_POOL_MASK - 1);

		sbio->bi_flags |= 1 << BIO_UPTODATE;

		sbio->bi_next = NULL;

		sbio->bi_sector = r1_bio->sector +

			conf->mirrors[i].rdev->data_offset;

		sbio->bi_bdev = conf->mirrors[i].rdev->bdev;

		sbio->bi_end_io = end_sync_read;

		sbio->bi_private = r1_bio;



		size = sbio->bi_size;

		for (j = 0; j < vcnt ; j++) {

			struct bio_vec *bi;
@@ -2439,18 +2438,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp 
	for (i = 0; i < conf->raid_disks * 2; i++) {

		struct md_rdev *rdev;

		bio = r1_bio->bios[i];



		/* take from bio_init */

		bio->bi_next = NULL;

		bio->bi_flags &= ~(BIO_POOL_MASK-1);

		bio->bi_flags |= 1 << BIO_UPTODATE;

		bio->bi_rw = READ;

		bio->bi_vcnt = 0;

		bio->bi_idx = 0;

		bio->bi_phys_segments = 0;

		bio->bi_size = 0;

		bio->bi_end_io = NULL;

		bio->bi_private = NULL;

		bio_reset(bio);



		rdev = rcu_dereference(conf->mirrors[i].rdev);

		if (rdev == NULL ||