Commit 645b5ed8 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-6.0 

Pull MD fixes from Song:

"1. Fix for clustered raid, by Guoqing Jiang.
 2. req_op fix, by Bart Van Assche.
 3. Fix race condition in raid recreate, by David Sloan."

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md: call __md_stop_writes in md_stop
  Revert "md-raid: destroy the bitmap after destroying the thread"
  md: Flush workqueue md_rdev_misc_wq in md_alloc()
  md/raid10: Fix the data type of an r10_sync_page_io() argument
parents c490a0b5 0dd84b31

drivers/md/md.c

+3 −1
Original line number Diff line number Diff line
@@ -5620,6 +5620,7 @@ struct mddev *md_alloc(dev_t dev, char *name) 
	 * removed (mddev_delayed_delete).

	 */

	flush_workqueue(md_misc_wq);

	flush_workqueue(md_rdev_misc_wq);



	mutex_lock(&disks_mutex);

	mddev = mddev_alloc(dev);
@@ -6238,11 +6239,11 @@ static void mddev_detach(struct mddev *mddev) 
static void __md_stop(struct mddev *mddev)

{

	struct md_personality *pers = mddev->pers;

	md_bitmap_destroy(mddev);

	mddev_detach(mddev);

	/* Ensure ->event_work is done */

	if (mddev->event_work.func)

		flush_workqueue(md_misc_wq);

	md_bitmap_destroy(mddev);

	spin_lock(&mddev->lock);

	mddev->pers = NULL;

	spin_unlock(&mddev->lock);
@@ -6260,6 +6261,7 @@ void md_stop(struct mddev *mddev) 
	/* stop the array and free an attached data structures.

	 * This is called from dm-raid

	 */

	__md_stop_writes(mddev);

	__md_stop(mddev);

	bioset_exit(&mddev->bio_set);

	bioset_exit(&mddev->sync_set);

drivers/md/raid10.c

+6 −7
Original line number Diff line number Diff line
@@ -2639,18 +2639,18 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) 
}



static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,

			    int sectors, struct page *page, int rw)

			    int sectors, struct page *page, enum req_op op)

{

	sector_t first_bad;

	int bad_sectors;



	if (is_badblock(rdev, sector, sectors, &first_bad, &bad_sectors)

	    && (rw == READ || test_bit(WriteErrorSeen, &rdev->flags)))

	    && (op == REQ_OP_READ || test_bit(WriteErrorSeen, &rdev->flags)))

		return -1;

	if (sync_page_io(rdev, sector, sectors << 9, page, rw, false))

	if (sync_page_io(rdev, sector, sectors << 9, page, op, false))

		/* success */

		return 1;

	if (rw == WRITE) {

	if (op == REQ_OP_WRITE) {

		set_bit(WriteErrorSeen, &rdev->flags);

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

			set_bit(MD_RECOVERY_NEEDED,
@@ -2780,7 +2780,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 
			if (r10_sync_page_io(rdev,

					     r10_bio->devs[sl].addr +

					     sect,

					     s, conf->tmppage, WRITE)

					     s, conf->tmppage, REQ_OP_WRITE)

			    == 0) {

				/* Well, this device is dead */

				pr_notice("md/raid10:%s: read correction write failed (%d sectors at %llu on %pg)\n",
@@ -2814,8 +2814,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 
			switch (r10_sync_page_io(rdev,

					     r10_bio->devs[sl].addr +

					     sect,

					     s, conf->tmppage,

						 READ)) {

					     s, conf->tmppage, REQ_OP_READ)) {

			case 0:

				/* Well, this device is dead */

				pr_notice("md/raid10:%s: unable to read back corrected sectors (%d sectors at %llu on %pg)\n",