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>

diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index 3ae8419e72cf93ae7fc8d92fff591e3e658b5b01..1b7436932a2b013a6462f05b7078ec6c464cc8dd 100644 (file)
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -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

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 42002c2930b04d52be8e4623d04261c42eaa727d..51edbbb91369231f6170e78e520e33622d01b7af 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -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;

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 11879e98c24911bb024ae156bf6e062b3c6b4f6c..4b8a48d48ba13394cf0ae7a7dc0016696ae5efd6 100644 (file)
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -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);

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f82e05df905b1dcbad19603b8883e9f101c1cda2..d838a89639f22101d1d2993d48ac0c633e4af833 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -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,
 };