diff options
| author | Christoph Hellwig | 2017-04-26 09:40:39 +0200 |
|---|---|---|
| committer | Mike Snitzer | 2017-05-01 18:19:03 -0400 |
| commit | 412445acb6cad4cef026daae37c4765fb9942c60 (patch) | |
| tree | 52b970ffec3a57e313473e67205729a696c743ec /drivers/md | |
| parent | 7ed8578a96ad98231d8bf6388f776e034673e18a (diff) | |
dm: introduce a new DM_MAPIO_KILL return value
This untangles the DM_MAPIO_* values returned from ->clone_and_map_rq
from the error codes used by the block layer.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-rq.c | 12 | ||||
| -rw-r--r-- | drivers/md/dm-target.c | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index 920e854caba9..a48130b90157 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -504,14 +504,12 @@ static int map_request(struct dm_rq_target_io *tio) /* The target wants to requeue the I/O after a delay */ dm_requeue_original_request(tio, true); break; - default: - if (r > 0) { - DMWARN("unimplemented target map return value: %d", r); - BUG(); - } - + case DM_MAPIO_KILL: /* The target wants to complete the I/O */ - dm_kill_unmapped_request(rq, r); + dm_kill_unmapped_request(rq, -EIO); + default: + DMWARN("unimplemented target map return value: %d", r); + BUG(); } return r; diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c index 43d3445b121d..6264ff00dcf0 100644 --- a/drivers/md/dm-target.c +++ b/drivers/md/dm-target.c @@ -135,7 +135,7 @@ static int io_err_clone_and_map_rq(struct dm_target *ti, struct request *rq, union map_info *map_context, struct request **clone) { - return -EIO; + return DM_MAPIO_KILL; } static void io_err_release_clone_rq(struct request *clone) |