summaryrefslogtreecommitdiff
path: root/block/blk.h
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-04-24 18:51:47 +0400
committerJens Axboe <axboe@fb.com>2014-04-24 18:51:47 +0400
commit87ee7b112193bd081ba1a171fa5f6f39c429ef56 (patch)
treefbf88d2de279209467dee4d6cd9007f5daa8a678 /block/blk.h
parent70ab0b2d51f84fc7d9eb6ed81c3986595efaa33d (diff)
downloadlinux-87ee7b112193bd081ba1a171fa5f6f39c429ef56.tar.xz
blk-mq: fix race with timeouts and requeue events
If a requeue event races with a timeout, we can get into the situation where we attempt to complete a request from the timeout handler when it's not start anymore. This causes a crash. So have the timeout handler check that REQ_ATOM_STARTED is still set on the request - if not, we ignore the event. If this happens, the request has now been marked as complete. As a consequence, we need to ensure to clear REQ_ATOM_COMPLETE in blk_mq_start_request(), as to maintain proper request state. Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk.h')
-rw-r--r--block/blk.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk.h b/block/blk.h
index 1d880f1f957f..79be2cbce7fd 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -37,9 +37,8 @@ bool __blk_end_bidi_request(struct request *rq, int error,
void blk_rq_timed_out_timer(unsigned long data);
void blk_rq_check_expired(struct request *rq, unsigned long *next_timeout,
unsigned int *next_set);
-void __blk_add_timer(struct request *req, struct list_head *timeout_list);
+void blk_add_timer(struct request *req);
void blk_delete_timer(struct request *);
-void blk_add_timer(struct request *);
bool bio_attempt_front_merge(struct request_queue *q, struct request *req,