diff options
author | Mike Snitzer <snitzer@redhat.com> | 2015-03-31 12:00:32 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-03-31 12:00:32 -0400 |
commit | 851c9f38e4199adb612366f8e202036d624d5de2 (patch) | |
tree | 4b9bfae45b5a9cfb324577a838a59de0cfc3f7a5 /include/linux | |
parent | e9637415a92cf25ad800b7fdeddcd30cce7b44ab (diff) | |
parent | c76cbbcf404475f8885b2252049dac99b0614868 (diff) | |
download | linux-851c9f38e4199adb612366f8e202036d624d5de2.tar.gz linux-851c9f38e4199adb612366f8e202036d624d5de2.tar.bz2 linux-851c9f38e4199adb612366f8e202036d624d5de2.zip |
Merge remote-tracking branch 'jens/for-4.1/core' into dm/for-next
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/blk-mq.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 7aec86127335..ebfe707cf722 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -164,6 +164,8 @@ enum { << BLK_MQ_F_ALLOC_POLICY_START_BIT) struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *); +struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, + struct request_queue *q); void blk_mq_finish_init(struct request_queue *q); int blk_mq_register_disk(struct gendisk *); void blk_mq_unregister_disk(struct gendisk *); @@ -218,6 +220,7 @@ void blk_mq_start_hw_queue(struct blk_mq_hw_ctx *hctx); void blk_mq_stop_hw_queues(struct request_queue *q); void blk_mq_start_hw_queues(struct request_queue *q); void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async); +void blk_mq_run_hw_queues(struct request_queue *q, bool async); void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs); void blk_mq_tag_busy_iter(struct blk_mq_hw_ctx *hctx, busy_iter_fn *fn, void *priv); |