diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 10:40:20 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 10:40:20 -0500 |
| commit | dc843ef00e79ef0466d4d66bb20beeccda92e003 (patch) | |
| tree | 7491381fdd81b6d40b25fec533e6f249d7823ce3 /block/blk-mq.c | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| parent | 249b15ba6380830881b7863ca5dd3f33320adfdb (diff) | |
Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 1d016fc9a8b6..92ceef0d2ab9 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
| @@ -2049,6 +2049,8 @@ static int blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set) | |||
| 2049 | */ | 2049 | */ |
| 2050 | int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) | 2050 | int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) |
| 2051 | { | 2051 | { |
| 2052 | BUILD_BUG_ON(BLK_MQ_MAX_DEPTH > 1 << BLK_MQ_UNIQUE_TAG_BITS); | ||
| 2053 | |||
| 2052 | if (!set->nr_hw_queues) | 2054 | if (!set->nr_hw_queues) |
| 2053 | return -EINVAL; | 2055 | return -EINVAL; |
| 2054 | if (!set->queue_depth) | 2056 | if (!set->queue_depth) |