Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6600593c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: rename BLK_EH_NOT_HANDLED to BLK_EH_DONE 



The BLK_EH_NOT_HANDLED implies nothing happen, but very often that
is not what is happening - instead the driver already completed the
command.  Fix the symbolic name to reflect that a little better.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 12f5b931

Documentation/scsi/scsi_eh.txt

+2 −2
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ function 
	This indicates that more time is required to finish the

	command.  Timer is restarted.  This action is counted as a

	retry and only allowed scmd->allowed + 1(!) times.  Once the

	limit is reached, action for BLK_EH_NOT_HANDLED is taken instead.

	limit is reached, action for BLK_EH_DONE is taken instead.



    - BLK_EH_NOT_HANDLED

    - BLK_EH_DONE

        eh_timed_out() callback did not handle the command.

	Step #2 is taken.

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ static void blk_mq_rq_timed_out(struct request *req, bool reserved) 
	case BLK_EH_RESET_TIMER:

		blk_add_timer(req);

		break;

	case BLK_EH_NOT_HANDLED:

	case BLK_EH_DONE:

		break;

	default:

		printk(KERN_ERR "block: bad eh return: %d\n", ret);

block/blk-timeout.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static void blk_rq_timed_out(struct request *req) 
		blk_add_timer(req);

		blk_clear_rq_complete(req);

		break;

	case BLK_EH_NOT_HANDLED:

	case BLK_EH_DONE:

		/*

		 * LLD handles this for now but in the future

		 * we can send a request msg to abort the command

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, 
			}

			blk_mq_requeue_request(req, true);

			nbd_config_put(nbd);

			return BLK_EH_NOT_HANDLED;

			return BLK_EH_DONE;

		}

	} else {

		dev_err_ratelimited(nbd_to_dev(nbd),

drivers/message/fusion/mptsas.c

+1 −1
Original line number Diff line number Diff line
@@ -1929,7 +1929,7 @@ static enum blk_eh_timer_return mptsas_eh_timed_out(struct scsi_cmnd *sc) 
	MPT_SCSI_HOST *hd;

	MPT_ADAPTER   *ioc;

	VirtDevice    *vdevice;

	enum blk_eh_timer_return rc = BLK_EH_NOT_HANDLED;

	enum blk_eh_timer_return rc = BLK_EH_DONE;



	hd = shost_priv(sc->device->host);

	if (hd == NULL) {