From: Goldwyn Rodrigues <[email protected]> If the I/O would block because the devices are syncing, bail.
Signed-off-by: Goldwyn Rodrigues <[email protected]> --- drivers/md/dm-raid1.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index c0b82136b2d1..96044b7787f9 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c @@ -1204,6 +1204,14 @@ static int mirror_map(struct dm_target *ti, struct bio *bio) if (rw == WRITE) { /* Save region for mirror_end_io() handler */ bio_record->write_region = dm_rh_bio_to_region(ms->rh, bio); + if (bio->bi_opf & REQ_NOWAIT) { + int state = dm_rh_get_state(ms->rh, + bio_record->write_region, 1); + if (state != DM_RH_CLEAN && state != DM_RH_DIRTY) { + bio_wouldblock_error(bio); + return DM_MAPIO_SUBMITTED; + } + } queue_bio(ms, bio, rw); return DM_MAPIO_SUBMITTED; } @@ -1219,6 +1227,11 @@ static int mirror_map(struct dm_target *ti, struct bio *bio) if (bio->bi_opf & REQ_RAHEAD) return DM_MAPIO_KILL; + if (bio->bi_opf & REQ_NOWAIT) { + bio_wouldblock_error(bio); + return DM_MAPIO_SUBMITTED; + } + queue_bio(ms, bio, rw); return DM_MAPIO_SUBMITTED; } -- 2.14.2
