diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2017-11-03 10:28:51 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-11-03 10:28:51 -0600 |
| commit | 3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4 (patch) | |
| tree | 613bdf98252519e5a538c386d1a3054aaaade4de /include/linux/blk-mq.h | |
| parent | skd: use ktime_get_real_seconds() (diff) | |
| parent | nvme: comment typo fixed in clearing AER (diff) | |
| download | linux-dev-3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4.tar.xz linux-dev-3e2cb3ad47500ed12d4c8b4cbd737dca352e38e4.zip | |
Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-4.15/block
Pull NVMe changes from Christoph:
"Below are the currently queue nvme updates for Linux 4.15. There are
a few more things that could make it for this merge window, but I'd
like to get things into linux-next, especially for the unlikely case
that Linus decided to cut -rc8.
Highlights:
- support for SGLs in the PCIe driver (Chaitanya Kulkarni)
- disable I/O schedulers for the admin queue (Israel Rukshin)
- various Fibre Channel fixes and enhancements (James Smart)
- various refactoring for better code sharing between transports
(Sagi Grimberg and me)
as well as lots of little bits from various contributors."
Diffstat (limited to 'include/linux/blk-mq.h')
| -rw-r--r-- | include/linux/blk-mq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index e5e6becd57d3..f2e3079eecdd 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -272,8 +272,8 @@ void blk_freeze_queue_start(struct request_queue *q); void blk_mq_freeze_queue_wait(struct request_queue *q); int blk_mq_freeze_queue_wait_timeout(struct request_queue *q, unsigned long timeout); -int blk_mq_reinit_tagset(struct blk_mq_tag_set *set, - int (reinit_request)(void *, struct request *)); +int blk_mq_tagset_iter(struct blk_mq_tag_set *set, void *data, + int (reinit_request)(void *, struct request *)); int blk_mq_map_queues(struct blk_mq_tag_set *set); void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues); |