diff options
| author | Jens Axboe <axboe@fb.com> | 2014-05-19 11:52:35 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-19 11:52:35 -0600 |
| commit | 39a9f97e5ea99e048c4980c23cf197f6e77995cb (patch) | |
| tree | b1f72ed1e852372b6d86b79157b09f77fabc5a20 /include/linux/blk-mq.h | |
| parent | 1429d7c9467e1e3de0b0ff91d7e4d67c1a92f8a3 (diff) | |
| parent | 0d2602ca30e410e84e8bdf05c84ed5688e0a5a44 (diff) | |
Merge branch 'for-3.16/blk-mq-tagging' into for-3.16/core
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/blk-mq-tag.c
Diffstat (limited to 'include/linux/blk-mq.h')
| -rw-r--r-- | include/linux/blk-mq.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 952e558ee598..a06ca7b5ea05 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -54,6 +54,8 @@ struct blk_mq_hw_ctx { unsigned int numa_node; unsigned int cmd_size; /* per-request extra data */ + atomic_t nr_active; + struct blk_mq_cpu_notifier cpu_notifier; struct kobject kobj; }; @@ -70,6 +72,9 @@ struct blk_mq_tag_set { void *driver_data; struct blk_mq_tags **tags; + + struct mutex tag_list_lock; + struct list_head tag_list; }; typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, struct request *); @@ -132,8 +137,10 @@ enum { BLK_MQ_F_SHOULD_MERGE = 1 << 0, BLK_MQ_F_SHOULD_SORT = 1 << 1, + BLK_MQ_F_TAG_SHARED = 1 << 2, BLK_MQ_S_STOPPED = 0, + BLK_MQ_S_TAG_ACTIVE = 1, BLK_MQ_MAX_DEPTH = 2048, |