summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-04-26 09:40:39 +0200
committerMike Snitzer <snitzer@redhat.com>2017-05-01 18:19:03 -0400
commit412445acb6cad4cef026daae37c4765fb9942c60 (patch)
tree52b970ffec3a57e313473e67205729a696c743ec
parent7ed8578a96ad98231d8bf6388f776e034673e18a (diff)
downloadop-kernel-dev-412445acb6cad4cef026daae37c4765fb9942c60.zip
op-kernel-dev-412445acb6cad4cef026daae37c4765fb9942c60.tar.gz
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>
-rw-r--r--drivers/md/dm-rq.c12
-rw-r--r--drivers/md/dm-target.c2
-rw-r--r--include/linux/device-mapper.h1
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index 920e854..a48130b 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 43d3445..6264ff0 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)
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 5a02fc0..78ad062 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -604,6 +604,7 @@ extern struct ratelimit_state dm_ratelimit_state;
#define DM_MAPIO_REMAPPED 1
#define DM_MAPIO_REQUEUE DM_ENDIO_REQUEUE
#define DM_MAPIO_DELAY_REQUEUE 3
+#define DM_MAPIO_KILL 4
#define dm_sector_div64(x, y)( \
{ \
OpenPOWER on IntegriCloud