diff options
| author | Tejun Heo <tj@kernel.org> | 2018-01-09 08:29:51 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-09 09:31:15 -0700 |
| commit | 634f9e4631a88025d3b90c1884e9a1b6a13d01d2 (patch) | |
| tree | 181882ff0dc0d5b0844ede83e2cfc954e28df69f /block/blk-timeout.c | |
| parent | 358f70da49d77c43f2ca11b5da584213b2add29c (diff) | |
| download | linux-0-day-634f9e4631a88025d3b90c1884e9a1b6a13d01d2.tar.gz linux-0-day-634f9e4631a88025d3b90c1884e9a1b6a13d01d2.tar.xz | |
blk-mq: remove REQ_ATOM_COMPLETE usages from blk-mq
After the recent updates to use generation number and state based
synchronization, blk-mq no longer depends on REQ_ATOM_COMPLETE except
to avoid firing the same timeout multiple times.
Remove all REQ_ATOM_COMPLETE usages and use a new rq_flags flag
RQF_MQ_TIMEOUT_EXPIRED to avoid firing the same timeout multiple
times. This removes atomic bitops from hot paths too.
v2: Removed blk_clear_rq_complete() from blk_mq_rq_timed_out().
v3: Added RQF_MQ_TIMEOUT_EXPIRED flag.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: "jianchao.wang" <jianchao.w.wang@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-timeout.c')
| -rw-r--r-- | block/blk-timeout.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 4f04cd1e0b744..ebe99963386c0 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -214,6 +214,7 @@ void blk_add_timer(struct request *req) req->timeout = q->rq_timeout; req->deadline = jiffies + req->timeout; + req->rq_flags &= ~RQF_MQ_TIMEOUT_EXPIRED; /* * Only the non-mq case needs to add the request to a protected list. |