From: Xueshi Hu Date: Mon, 14 Aug 2023 13:53:56 +0000 (+0800) Subject: md/raid1: hold the barrier until handle_read_error() finishes X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c069da449a13669ffa754fd971747e7e17e7d691;p=linux.git 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: 689389a06ce7 ("md/raid1: simplify handle_read_error().") Reviewed-by: Yu Kuai Signed-off-by: Xueshi Hu Link: https://lore.kernel.org/r/20230814135356.1113639-4-xueshi.hu@smartx.com Signed-off-by: Song Liu --- diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index b3fc44157cfcc..56f2725a996ff 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -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)