diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
| commit | f95a0d6a95b12a79b7492da7ab687ae4cd741124 (patch) | |
| tree | 503ad30af40e94bbc090fc7de45a051030646141 /block/blk-mq.c | |
| parent | a9590fe148c03cb4157b56255357419cb4e14124 (diff) | |
| parent | 8e8320c9315c47a6a090188720ccff32a6a6ba18 (diff) | |
| download | op-kernel-dev-f95a0d6a95b12a79b7492da7ab687ae4cd741124.zip op-kernel-dev-f95a0d6a95b12a79b7492da7ab687ae4cd741124.tar.gz | |
Merge commit '8e8320c9315c' into for-4.13/block
Pull in the fix for shared tags, as it conflicts with the pending
changes in for-4.13/block. We already pulled in v4.12-rc5 to solve
other conflicts or get fixes that went into 4.12, so not a lot
of changes in this merge.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index c56b64a..05dfa3f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2112,20 +2112,30 @@ static void blk_mq_map_swqueue(struct request_queue *q, } } +/* + * Caller needs to ensure that we're either frozen/quiesced, or that + * the queue isn't live yet. + */ static void queue_set_hctx_shared(struct request_queue *q, bool shared) { struct blk_mq_hw_ctx *hctx; int i; queue_for_each_hw_ctx(q, hctx, i) { - if (shared) + if (shared) { + if (test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state)) + atomic_inc(&q->shared_hctx_restart); hctx->flags |= BLK_MQ_F_TAG_SHARED; - else + } else { + if (test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state)) + atomic_dec(&q->shared_hctx_restart); hctx->flags &= ~BLK_MQ_F_TAG_SHARED; + } } } -static void blk_mq_update_tag_set_depth(struct blk_mq_tag_set *set, bool shared) +static void blk_mq_update_tag_set_depth(struct blk_mq_tag_set *set, + bool shared) { struct request_queue *q; |
