bdi: Fix another oops in wb_workfn()

[linux.git] / block / blk-timeout.c

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 652d4d4d3e9726855bfb73d185ed9c44cad0a63f..4b8a48d48ba13394cf0ae7a7dc0016696ae5efd6 100644 (file)
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -86,14 +86,11 @@ 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);
                break;
-       case BLK_EH_NOT_HANDLED:
+       case BLK_EH_DONE:
                /*
                 * LLD handles this for now but in the future
                 * we can send a request msg to abort the command
@@ -214,7 +211,6 @@ void blk_add_timer(struct request *req)
                req->timeout = q->rq_timeout;
 
        blk_rq_set_deadline(req, jiffies + req->timeout);
-       req->rq_flags &= ~RQF_MQ_TIMEOUT_EXPIRED;
 
        /*
         * Only the non-mq case needs to add the request to a protected list.