dm raid: fix false positive for requeue needed during reshape

[ Upstream commit b25b8f4b8ecef0f48c05f0c3572daeabefe16526 ]

An empty flush doesn't have a payload, so it should never be looked at
when considering to possibly requeue a bio for the case when a reshape
is in progress.

Fixes: 9dbd1aa3a8 ("dm raid: add reshaping support to the target")
Reported-by: Patrick Plenefisch <simonpatp@gmail.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ming Lei
2024-03-11 13:42:55 -04:00
committed by Sasha Levin
parent 928705e341
commit 94a6a9cfbf

View File

@@ -3329,14 +3329,14 @@ static int raid_map(struct dm_target *ti, struct bio *bio)
struct mddev *mddev = &rs->md; struct mddev *mddev = &rs->md;
/* /*
* If we're reshaping to add disk(s)), ti->len and * If we're reshaping to add disk(s), ti->len and
* mddev->array_sectors will differ during the process * mddev->array_sectors will differ during the process
* (ti->len > mddev->array_sectors), so we have to requeue * (ti->len > mddev->array_sectors), so we have to requeue
* bios with addresses > mddev->array_sectors here or * bios with addresses > mddev->array_sectors here or
* there will occur accesses past EOD of the component * there will occur accesses past EOD of the component
* data images thus erroring the raid set. * data images thus erroring the raid set.
*/ */
if (unlikely(bio_end_sector(bio) > mddev->array_sectors)) if (unlikely(bio_has_data(bio) && bio_end_sector(bio) > mddev->array_sectors))
return DM_MAPIO_REQUEUE; return DM_MAPIO_REQUEUE;
md_handle_request(mddev, bio); md_handle_request(mddev, bio);