Commit a1275677 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe

dm mpath: Use blk_path_error

Uses common code for determining if an error should be retried on
alternate path.
Acked-by: default avatarMike Snitzer <snitzer@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e1f425e7
...@@ -1475,21 +1475,6 @@ static void activate_path_work(struct work_struct *work) ...@@ -1475,21 +1475,6 @@ static void activate_path_work(struct work_struct *work)
activate_or_offline_path(pgpath); activate_or_offline_path(pgpath);
} }
static int noretry_error(blk_status_t error)
{
switch (error) {
case BLK_STS_NOTSUPP:
case BLK_STS_NOSPC:
case BLK_STS_TARGET:
case BLK_STS_NEXUS:
case BLK_STS_MEDIUM:
return 1;
}
/* Anything else could be a path failure, so should be retried */
return 0;
}
static int multipath_end_io(struct dm_target *ti, struct request *clone, static int multipath_end_io(struct dm_target *ti, struct request *clone,
blk_status_t error, union map_info *map_context) blk_status_t error, union map_info *map_context)
{ {
...@@ -1508,7 +1493,7 @@ static int multipath_end_io(struct dm_target *ti, struct request *clone, ...@@ -1508,7 +1493,7 @@ static int multipath_end_io(struct dm_target *ti, struct request *clone,
* request into dm core, which will remake a clone request and * request into dm core, which will remake a clone request and
* clone bios for it and resubmit it later. * clone bios for it and resubmit it later.
*/ */
if (error && !noretry_error(error)) { if (error && blk_path_error(error)) {
struct multipath *m = ti->private; struct multipath *m = ti->private;
r = DM_ENDIO_REQUEUE; r = DM_ENDIO_REQUEUE;
...@@ -1544,7 +1529,7 @@ static int multipath_end_io_bio(struct dm_target *ti, struct bio *clone, ...@@ -1544,7 +1529,7 @@ static int multipath_end_io_bio(struct dm_target *ti, struct bio *clone,
unsigned long flags; unsigned long flags;
int r = DM_ENDIO_DONE; int r = DM_ENDIO_DONE;
if (!*error || noretry_error(*error)) if (!*error || !blk_path_error(*error))
goto done; goto done;
if (pgpath) if (pgpath)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment