Commit 854abd75 authored by NeilBrown's avatar NeilBrown Committed by Shaohua Li
Browse files

md/raid1: small code cleanup in end_sync_write 



'mirror' is only used to find 'rdev', several times.
So just find 'rdev' once, and use it instead.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent e5872d58

drivers/md/raid1.c

+4 −10
Original line number Diff line number Diff line
@@ -1709,11 +1709,9 @@ static void end_sync_write(struct bio *bio) 
	struct r1bio *r1_bio = bio->bi_private;

	struct mddev *mddev = r1_bio->mddev;

	struct r1conf *conf = mddev->private;

	int mirror=0;

	sector_t first_bad;

	int bad_sectors;



	mirror = find_bio_disk(r1_bio, bio);

	struct md_rdev *rdev = conf->mirrors[find_bio_disk(r1_bio, bio)].rdev;



	if (!uptodate) {

		sector_t sync_blocks = 0;
@@ -1726,16 +1724,12 @@ static void end_sync_write(struct bio *bio) 
			s += sync_blocks;

			sectors_to_go -= sync_blocks;

		} while (sectors_to_go > 0);

		set_bit(WriteErrorSeen,

			&conf->mirrors[mirror].rdev->flags);

		if (!test_and_set_bit(WantReplacement,

				      &conf->mirrors[mirror].rdev->flags))

		set_bit(WriteErrorSeen, &rdev->flags);

		if (!test_and_set_bit(WantReplacement, &rdev->flags))

			set_bit(MD_RECOVERY_NEEDED, &

				mddev->recovery);

		set_bit(R1BIO_WriteError, &r1_bio->state);

	} else if (is_badblock(conf->mirrors[mirror].rdev,

			       r1_bio->sector,

			       r1_bio->sectors,

	} else if (is_badblock(rdev, r1_bio->sector, r1_bio->sectors,

			       &first_bad, &bad_sectors) &&

		   !is_badblock(conf->mirrors[r1_bio->read_disk].rdev,

				r1_bio->sector,