Commit 296aec45 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-linus 

Pull MD fixes from Song.

* 'md-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md: make sure desc_nr less than MD_SB_DISKS
  md: raid1: check rdev before reference in raid1_sync_request func
  raid5: need to set STRIPE_HANDLE for batch head
parents cc90bc68 3b7436cc

drivers/md/md.c

+1 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor 
	/* not spare disk, or LEVEL_MULTIPATH */

	if (sb->level == LEVEL_MULTIPATH ||

		(rdev->desc_nr >= 0 &&

		 rdev->desc_nr < MD_SB_DISKS &&

		 sb->disks[rdev->desc_nr].state &

		 ((1<<MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE))))

		spare_disk = false;

drivers/md/raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -2782,7 +2782,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, 
				write_targets++;

			}

		}

		if (bio->bi_end_io) {

		if (rdev && bio->bi_end_io) {

			atomic_inc(&rdev->nr_pending);

			bio->bi_iter.bi_sector = sector_nr + rdev->data_offset;

			bio_set_dev(bio, rdev->bdev);

drivers/md/raid5.c

+1 −1
Original line number Diff line number Diff line
@@ -5726,7 +5726,7 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) 
				do_flush = false;

			}



			if (!sh->batch_head)

			if (!sh->batch_head || sh == sh->batch_head)

				set_bit(STRIPE_HANDLE, &sh->state);

			clear_bit(STRIPE_DELAYED, &sh->state);

			if ((!sh->batch_head || sh == sh->batch_head) &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE