diff options
| author | Ming Lei <ming.lei@redhat.com> | 2018-01-11 07:01:55 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2018-01-17 15:16:18 +0100 |
| commit | 459b54019cfeb7330ed4863ad40f78489e0ff23d (patch) | |
| tree | b700bef3cc4f480d11eca83888081a044c302b5a /drivers/md | |
| parent | dm mpath: return DM_MAPIO_REQUEUE on blk-mq rq allocation failure (diff) | |
| download | linux-459b54019cfeb7330ed4863ad40f78489e0ff23d.tar.xz linux-459b54019cfeb7330ed4863ad40f78489e0ff23d.zip | |
dm mpath: return DM_MAPIO_DELAY_REQUEUE if QUEUE_IO or PG_INIT_REQUIRED
Avoid using DM_MAPIO_REQUEUE unless absolutely necessary because it
results in dm-rq.c:dm_mq_queue_rq() returning BLK_STS_RESOURCE to
blk-mq -- doing so should only ever be done if the underlying queue is
out of resources. So switch to returning DM_MAPIO_DELAY_REQUEUE from
multipath_clone_and_map() if either MPATHF_QUEUE_IO or
MPATHF_PG_INIT_REQUIRED are set.
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-mpath.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index e0187798ccae..815de2b091a5 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -517,9 +517,8 @@ static int multipath_clone_and_map(struct dm_target *ti, struct request *rq, 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)) - return DM_MAPIO_DELAY_REQUEUE; - return DM_MAPIO_REQUEUE; + pg_init_all_paths(m); + return DM_MAPIO_DELAY_REQUEUE; } mpio->pgpath = pgpath; |