summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-05-15 17:28:38 +0200
committerMike Snitzer <snitzer@redhat.com>2017-05-15 15:09:53 -0400
commitf98e0eb68008aff9824d1c4dad7276c8bab83ca5 (patch)
treee7fb30ed707b8270c3e7d417d300607b35c42f51 /drivers/md
parent18a482f5245cc875755090853e84283512b3e6bd (diff)
downloadlinux-f98e0eb68008aff9824d1c4dad7276c8bab83ca5.tar.gz
linux-f98e0eb68008aff9824d1c4dad7276c8bab83ca5.tar.bz2
linux-f98e0eb68008aff9824d1c4dad7276c8bab83ca5.zip
dm mpath: multipath_clone_and_map must not return -EIO
Since 412445ac ("dm: introduce a new DM_MAPIO_KILL return value"), the clone_and_map_rq methods must not return errno values, so fix it up to properly return DM_MAPIO_KILL, instead of the -EIO value that snuck in due to a conflict between two patches. 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-mpath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index d55454f98b59..3df056b73b66 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -481,7 +481,7 @@ static int multipath_clone_and_map(struct dm_target *ti, struct request *rq,
if (test_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags))
return DM_MAPIO_DELAY_REQUEUE;
dm_report_EIO(m); /* Failed */
- return -EIO;
+ return DM_MAPIO_KILL;
} else if (test_bit(MPATHF_QUEUE_IO, &m->flags) ||
test_bit(MPATHF_PG_INIT_REQUIRED, &m->flags)) {
if (pg_init_all_paths(m))