diff options
| author | Mike Snitzer | 2017-05-02 00:18:04 +0200 |
|---|---|---|
| committer | Mike Snitzer | 2017-05-02 00:18:04 +0200 |
| commit | 7e25a7606147bfe29a7421ff2cb332b07d3cee3a (patch) | |
| tree | 77047d7f4969712f8dc67e72283edc7900eaebf9 /drivers/md/dm-rq.c | |
| parent | block: hide badblocks attribute by default (diff) | |
| parent | dm bufio: check new buffer allocation watermark every 30 seconds (diff) | |
| download | kernel-qcow2-linux-7e25a7606147bfe29a7421ff2cb332b07d3cee3a.tar.gz kernel-qcow2-linux-7e25a7606147bfe29a7421ff2cb332b07d3cee3a.tar.xz kernel-qcow2-linux-7e25a7606147bfe29a7421ff2cb332b07d3cee3a.zip | |
Merge branch 'dm-4.12' into dm-4.12-post-merge
Diffstat (limited to 'drivers/md/dm-rq.c')
| -rw-r--r-- | drivers/md/dm-rq.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index bff7e3bdb4ed..d445b712970b 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -280,7 +280,7 @@ static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_ if (!rq->q->mq_ops) dm_old_requeue_request(rq); else - dm_mq_delay_requeue_request(rq, delay_requeue ? 5000 : 0); + dm_mq_delay_requeue_request(rq, delay_requeue ? 100/*ms*/ : 0); rq_completed(md, rw, false); } @@ -815,10 +815,14 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t) dm_init_md_queue(md); /* backfill 'mq' sysfs registration normally done in blk_register_queue */ - blk_mq_register_dev(disk_to_dev(md->disk), q); + err = blk_mq_register_dev(disk_to_dev(md->disk), q); + if (err) + goto out_cleanup_queue; return 0; +out_cleanup_queue: + blk_cleanup_queue(q); out_tag_set: blk_mq_free_tag_set(md->tag_set); out_kfree_tag_set: |