Commit a134cd8d authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'md-fixes-20231201-1' of... 

Merge tag 'md-fixes-20231201-1' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-6.7

Pull MD fix from Song:

"This change fixes issue with raid456 reshape."

* tag 'md-fixes-20231201-1' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid6: use valid sector values to determine if an I/O should wait on the reshape
parents 8ad3ac92 c467e97f

drivers/md/raid5.c

+2 −2
Original line number Diff line number Diff line
@@ -5892,11 +5892,11 @@ static bool stripe_ahead_of_reshape(struct mddev *mddev, struct r5conf *conf, 
	int dd_idx;



	for (dd_idx = 0; dd_idx < sh->disks; dd_idx++) {

		if (dd_idx == sh->pd_idx)

		if (dd_idx == sh->pd_idx || dd_idx == sh->qd_idx)

			continue;



		min_sector = min(min_sector, sh->dev[dd_idx].sector);

		max_sector = min(max_sector, sh->dev[dd_idx].sector);

		max_sector = max(max_sector, sh->dev[dd_idx].sector);

	}



	spin_lock_irq(&conf->device_lock);