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-sched.h | |
| parent | a9590fe148c03cb4157b56255357419cb4e14124 (diff) | |
| parent | 8e8320c9315c47a6a090188720ccff32a6a6ba18 (diff) | |
| download | lwn-f95a0d6a95b12a79b7492da7ab687ae4cd741124.tar.gz lwn-f95a0d6a95b12a79b7492da7ab687ae4cd741124.zip | |
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-sched.h')
| -rw-r--r-- | block/blk-mq-sched.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index e117edd039b1..9267d0b7c197 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h @@ -91,15 +91,6 @@ static inline bool blk_mq_sched_has_work(struct blk_mq_hw_ctx *hctx) return false; } -/* - * Mark a hardware queue as needing a restart. - */ -static inline void blk_mq_sched_mark_restart_hctx(struct blk_mq_hw_ctx *hctx) -{ - if (!test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state)) - set_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); -} - static inline bool blk_mq_sched_needs_restart(struct blk_mq_hw_ctx *hctx) { return test_bit(BLK_MQ_S_SCHED_RESTART, &hctx->state); |