hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2018-05-29 15:52:35 +02:00 committed by Jens Axboe
parent 1fc2b62edb
commit ad73d6fead
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/core/queue.c
View File

@ -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;