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_types.h | |
| parent | blk-mq: switch ctx pending map to the sparser blk_align_bitmap (diff) | |
| parent | blk-mq: improve support for shared tags maps (diff) | |
| download | linux-dev-39a9f97e5ea99e048c4980c23cf197f6e77995cb.tar.xz linux-dev-39a9f97e5ea99e048c4980c23cf197f6e77995cb.zip | |
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_types.h')
| -rw-r--r-- | include/linux/blk_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index aa0eaa2d0bd8..d8e4cea23a25 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -190,6 +190,7 @@ enum rq_flag_bits { __REQ_PM, /* runtime pm request */ __REQ_END, /* last of chain of requests */ __REQ_HASHED, /* on IO scheduler merge hash */ + __REQ_MQ_INFLIGHT, /* track inflight for MQ */ __REQ_NR_BITS, /* stops here */ }; @@ -243,5 +244,6 @@ enum rq_flag_bits { #define REQ_PM (1ULL << __REQ_PM) #define REQ_END (1ULL << __REQ_END) #define REQ_HASHED (1ULL << __REQ_HASHED) +#define REQ_MQ_INFLIGHT (1ULL << __REQ_MQ_INFLIGHT) #endif /* __LINUX_BLK_TYPES_H */ |