mmc: complete requests from ->timeout

By completing the request entirely in the driver we can remove the
BLK_EH_HANDLED return value and thus the split responsibility between the
driver and the block layer that has been causing trouble.

[While this keeps existing behavior it seems to mismatch the comment,
 maintainers please chime in!]

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 56e9a80..648eb67 100644 (file)
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -111,8 +111,9 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req)
                                __mmc_cqe_recovery_notifier(mq);
                        return BLK_EH_RESET_TIMER;
                }
-               /* No timeout */
-               return BLK_EH_HANDLED;
+               /* No timeout (XXX: huh? comment doesn't make much sense) */
+               blk_mq_complete_request(req);
+               return BLK_EH_DONE;
        default:
                /* Timeout is handled by mmc core */
                return BLK_EH_RESET_TIMER;