diff options
| author | Christoph Hellwig | 2018-11-14 17:02:05 +0100 |
|---|---|---|
| committer | Jens Axboe | 2018-11-15 20:13:16 +0100 |
| commit | 079076b3416e78ba2bb3ce38e05e320c388c3120 (patch) | |
| tree | 9542a0f94fc2fcf98be8be557148904f8a55e58e /block/blk-mq.c | |
| parent | block: remove QUEUE_FLAG_BYPASS and ->bypass (diff) | |
| download | kernel-qcow2-linux-079076b3416e78ba2bb3ce38e05e320c388c3120.tar.gz kernel-qcow2-linux-079076b3416e78ba2bb3ce38e05e320c388c3120.tar.xz kernel-qcow2-linux-079076b3416e78ba2bb3ce38e05e320c388c3120.zip | |
block: remove deadline __deadline manipulation helpers
No users left since the removal of the legacy request interface, we can
remove all the magic bit stealing now and make it a normal field.
But use WRITE_ONCE/READ_ONCE on the new deadline field, given that we
don't seem to have any mechanism to guarantee a new value actually
gets seen by other threads.
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 411be60d0cb6..4c82b4b4fa3e 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -325,7 +325,7 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, rq->special = NULL; /* tag was already set */ rq->extra_len = 0; - rq->__deadline = 0; + WRITE_ONCE(rq->deadline, 0); rq->timeout = 0; @@ -839,7 +839,7 @@ static bool blk_mq_req_expired(struct request *rq, unsigned long *next) if (rq->rq_flags & RQF_TIMED_OUT) return false; - deadline = blk_rq_deadline(rq); + deadline = READ_ONCE(rq->deadline); if (time_after_eq(jiffies, deadline)) return true; |