Commit ad73d6fe authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1fc2b62e
...@@ -111,8 +111,9 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req) ...@@ -111,8 +111,9 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req)
__mmc_cqe_recovery_notifier(mq); __mmc_cqe_recovery_notifier(mq);
return BLK_EH_RESET_TIMER; return BLK_EH_RESET_TIMER;
} }
/* No timeout */ /* No timeout (XXX: huh? comment doesn't make much sense) */
return BLK_EH_HANDLED; blk_mq_complete_request(req);
return BLK_EH_DONE;
default: default:
/* Timeout is handled by mmc core */ /* Timeout is handled by mmc core */
return BLK_EH_RESET_TIMER; return BLK_EH_RESET_TIMER;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment