Commit f6e7d48a authored May 29, 2018 by Christoph Hellwig Committed by Jens Axboe May 29, 2018

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>

parent adb2b769

Documentation/scsi/scsi_eh.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -82,17 +82,6 @@ function
		1. invokes optional hostt->eh_timed_out() callback. Return value can
		be one of

		- BLK_EH_HANDLED
		This indicates that eh_timed_out() dealt with the timeout.
		The command is passed back to the block layer and completed
		via __blk_complete_requests().

		NOTE After returning BLK_EH_HANDLED the SCSI layer is
		assumed to be finished with the command, and no other
		functions from the SCSI layer will be called. So this
		should typically only be returned if the eh_timed_out()
		handler raced with normal completion.

		- BLK_EH_RESET_TIMER
		This indicates that more time is required to finish the
		command. Timer is restarted. This action is counted as a

block/blk-mq.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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;

block/blk-timeout.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);

include/linux/blkdev.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -327,7 +327,6 @@ typedef void (exit_rq_fn)(struct request_queue , struct request );

		enum blk_eh_timer_return {
		BLK_EH_DONE,
		BLK_EH_HANDLED,
		BLK_EH_RESET_TIMER,
		};