diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-02 02:37:24 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-12-02 02:37:24 +0100 |
| commit | a134cd8dfb8cdfd8f019a7ec2ad5cb8e855f0245 (patch) | |
| tree | 2a11967790e55770dbf33bfb0b8759e31c769a29 /drivers/md | |
| parent | Merge tag 'nvme-6.7-2023-12-01' of git://git.infradead.org/nvme into block-6.7 (diff) | |
| parent | md/raid6: use valid sector values to determine if an I/O should wait on the r... (diff) | |
| download | linux-a134cd8dfb8cdfd8f019a7ec2ad5cb8e855f0245.tar.xz linux-a134cd8dfb8cdfd8f019a7ec2ad5cb8e855f0245.zip | |
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
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index dc031d42f53b..26e1e8a5e941 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -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); |