nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

dm: introduce a new DM_MAPIO_KILL return value

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2017-04-26 09:40:39 +02:00 committed by Mike Snitzer
parent 7ed8578a96
commit 412445acb6
3 changed files with 7 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/md/dm-rq.c
View file

@ -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 */ /* The target wants to requeue the I/O after a delay */
dm_requeue_original_request(tio, true); dm_requeue_original_request(tio, true);
break; break;
default: case DM_MAPIO_KILL:
if (r > 0) {
DMWARN("unimplemented target map return value: %d", r);
BUG();
}
/* The target wants to complete the I/O */ /* 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; return r;

2
drivers/md/dm-target.c
View file

@ -135,7 +135,7 @@ static int io_err_clone_and_map_rq(struct dm_target *ti, struct request *rq,
union map_info *map_context, union map_info *map_context,
struct request **clone) struct request **clone)
{ {
return -EIO; return DM_MAPIO_KILL;
} }
static void io_err_release_clone_rq(struct request *clone) static void io_err_release_clone_rq(struct request *clone)

1
include/linux/device-mapper.h
View file

@ -604,6 +604,7 @@ extern struct ratelimit_state dm_ratelimit_state;
#define DM_MAPIO_REMAPPED 1 #define DM_MAPIO_REMAPPED 1
#define DM_MAPIO_REQUEUE DM_ENDIO_REQUEUE #define DM_MAPIO_REQUEUE DM_ENDIO_REQUEUE
#define DM_MAPIO_DELAY_REQUEUE 3 #define DM_MAPIO_DELAY_REQUEUE 3
#define DM_MAPIO_KILL 4
#define dm_sector_div64(x, y)( \ #define dm_sector_div64(x, y)( \
{ \ { \