diff options
| author | Jens Axboe | 2014-05-28 17:50:26 +0200 |
|---|---|---|
| committer | Jens Axboe | 2014-05-28 17:50:26 +0200 |
| commit | 6178976500ae61fa7b12ebb2d3de816dc9396388 (patch) | |
| tree | 143df1479f56458801b676d038e6a7157a472981 /include/linux/blkdev.h | |
| parent | floppy: do not corrupt bio.bi_flags when reading block 0 (diff) | |
| parent | blk-mq: remove blk_mq_alloc_request_pinned (diff) | |
| download | kernel-qcow2-linux-6178976500ae61fa7b12ebb2d3de816dc9396388.tar.gz kernel-qcow2-linux-6178976500ae61fa7b12ebb2d3de816dc9396388.tar.xz kernel-qcow2-linux-6178976500ae61fa7b12ebb2d3de816dc9396388.zip | |
Merge branch 'for-3.16/core' into for-3.16/drivers
mtip32xx uses blk_mq_alloc_reserved_request(), so pull in the
core changes so we have a properly merged end result.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 74ee55fefcf0..e90e1692e052 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -90,15 +90,15 @@ enum rq_cmd_type_bits { #define BLK_MAX_CDB 16 /* - * try to put the fields that are referenced together in the same cacheline. - * if you modify this structure, be sure to check block/blk-core.c:blk_rq_init() - * as well! + * Try to put the fields that are referenced together in the same cacheline. + * + * If you modify this structure, make sure to update blk_rq_init() and + * especially blk_mq_rq_ctx_init() to take care of the added fields. */ struct request { struct list_head queuelist; union { struct call_single_data csd; - struct work_struct requeue_work; unsigned long fifo_time; }; @@ -462,6 +462,10 @@ struct request_queue { struct request *flush_rq; spinlock_t mq_flush_lock; + struct list_head requeue_list; + spinlock_t requeue_lock; + struct work_struct requeue_work; + struct mutex sysfs_lock; int bypass_depth; @@ -480,6 +484,9 @@ struct request_queue { wait_queue_head_t mq_freeze_wq; struct percpu_counter mq_usage_counter; struct list_head all_q_node; + + struct blk_mq_tag_set *tag_set; + struct list_head tag_set_list; }; #define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */ |