diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-29 15:52:37 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-05-29 08:59:21 -0600 |
| commit | f6e7d48a780a95a599d7e325f45e9ac208ac6f13 (patch) | |
| tree | 60a11edf2c2926346c894e31245ef1860984703c /block | |
| parent | adb2b769d47a619bff32fe521067dab0091c7e6d (diff) | |
| download | linux-0-day-f6e7d48a780a95a599d7e325f45e9ac208ac6f13.tar.gz linux-0-day-f6e7d48a780a95a599d7e325f45e9ac208ac6f13.tar.xz | |
block: remove BLK_EH_HANDLED
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 4 | ||||
| -rw-r--r-- | block/blk-timeout.c | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 42002c2930b04..51edbbb913692 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -777,10 +777,6 @@ static void blk_mq_rq_timed_out(struct request *req, bool reserved) ret = ops->timeout(req, reserved); switch (ret) { - case BLK_EH_HANDLED: - if (blk_mq_rq_state(req) == MQ_RQ_IN_FLIGHT) - __blk_mq_complete_request(req); - break; case BLK_EH_RESET_TIMER: blk_add_timer(req); break; diff --git a/block/blk-timeout.c b/block/blk-timeout.c index 11879e98c2491..4b8a48d48ba13 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -86,9 +86,6 @@ static void blk_rq_timed_out(struct request *req) if (q->rq_timed_out_fn) ret = q->rq_timed_out_fn(req); switch (ret) { - case BLK_EH_HANDLED: - __blk_complete_request(req); - break; case BLK_EH_RESET_TIMER: blk_add_timer(req); blk_clear_rq_complete(req); |