Commit c069da44 authored by Xueshi Hu's avatar Xueshi Hu Committed by Song Liu
Browse files

md/raid1: hold the barrier until handle_read_error() finishes 



handle_read_error() will call allow_barrier() to match the former barrier
raising. However, it should put the allow_barrier() at the end to avoid a
concurrent raid reshape.

Fixes: 689389a0 ("md/raid1: simplify handle_read_error().")
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarXueshi Hu <xueshi.hu@smartx.com>
Link: https://lore.kernel.org/r/20230814135356.1113639-4-xueshi.hu@smartx.com


Signed-off-by: default avatarSong Liu <song@kernel.org>
parent 992db13a

drivers/md/raid1.c

+3 −1
Original line number Diff line number Diff line
@@ -2511,6 +2511,7 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio) 
	struct mddev *mddev = conf->mddev;

	struct bio *bio;

	struct md_rdev *rdev;

	sector_t sector;



	clear_bit(R1BIO_ReadError, &r1_bio->state);

	/* we got a read error. Maybe the drive is bad.  Maybe just
@@ -2540,12 +2541,13 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio) 
	}



	rdev_dec_pending(rdev, conf->mddev);

	allow_barrier(conf, r1_bio->sector);

	sector = r1_bio->sector;

	bio = r1_bio->master_bio;



	/* Reuse the old r1_bio so that the IO_BLOCKED settings are preserved */

	r1_bio->state = 0;

	raid1_read_request(mddev, bio, r1_bio->sectors, r1_bio);

	allow_barrier(conf, sector);

}



static void raid1d(struct md_thread *thread)