Re: [PATCH 02/14] block: rename BLK_EH_NOT_HANDLED to BLK_EH_DONE

2018-05-23 Thread Hannes Reinecke 

On 05/23/2018 02:19 PM, Christoph Hellwig wrote:

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: Christoph Hellwig 
---
  Documentation/scsi/scsi_eh.txt| 4 ++--
  block/blk-mq.c| 2 +-
  block/blk-timeout.c   | 2 +-
  drivers/block/nbd.c   | 2 +-
  drivers/message/fusion/mptsas.c   | 2 +-
  drivers/s390/block/dasd.c | 6 +++---
  drivers/scsi/gdth.c   | 2 +-
  drivers/scsi/libiscsi.c   | 2 +-
  drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
  drivers/scsi/mvumi.c  | 2 +-
  drivers/scsi/qla4xxx/ql4_os.c | 2 +-
  drivers/scsi/scsi_error.c | 4 ++--
  drivers/scsi/scsi_transport_fc.c  | 4 ++--
  drivers/scsi/scsi_transport_srp.c | 4 ++--
  drivers/scsi/ufs/ufshcd.c | 6 +++---
  include/linux/blkdev.h| 2 +-
  include/scsi/scsi_host.h  | 2 +-
  17 files changed, 25 insertions(+), 25 deletions(-)


Reviewed-by: Hannes Reinecke 

Cheers,

Hannes

Re: [PATCH 02/14] block: rename BLK_EH_NOT_HANDLED to BLK_EH_DONE

2018-05-23 Thread Johannes Thumshirn 
Looks good,
Reviewed-by: Johannes Thumshirn 
-- 
Johannes Thumshirn  Storage
jthumsh...@suse.de+49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850

[PATCH 02/14] block: rename BLK_EH_NOT_HANDLED to BLK_EH_DONE

2018-05-23 Thread Christoph Hellwig 
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: Christoph Hellwig 
---
 Documentation/scsi/scsi_eh.txt| 4 ++--
 block/blk-mq.c| 2 +-
 block/blk-timeout.c   | 2 +-
 drivers/block/nbd.c   | 2 +-
 drivers/message/fusion/mptsas.c   | 2 +-
 drivers/s390/block/dasd.c | 6 +++---
 drivers/scsi/gdth.c   | 2 +-
 drivers/scsi/libiscsi.c   | 2 +-
 drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
 drivers/scsi/mvumi.c  | 2 +-
 drivers/scsi/qla4xxx/ql4_os.c | 2 +-
 drivers/scsi/scsi_error.c | 4 ++--
 drivers/scsi/scsi_transport_fc.c  | 4 ++--
 drivers/scsi/scsi_transport_srp.c | 4 ++--
 drivers/scsi/ufs/ufshcd.c | 6 +++---
 include/linux/blkdev.h| 2 +-
 include/scsi/scsi_host.h  | 2 +-
 17 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index 11e447bdb3a5..3ae8419e72cf 100644
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -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.
 
diff --git a/block/blk-mq.c b/block/blk-mq.c
index df928200b17e..546acc8cb201 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -856,7 +856,7 @@ static void blk_mq_rq_timed_out(struct request *req, bool 
reserved)
blk_mq_rq_update_aborted_gstate(req, 0);
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);
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 652d4d4d3e97..3c622335811f 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -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
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 1147e4680c80..09d9959287fe 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -328,7 +328,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),
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 86503f60468f..19a5aa70ecda 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -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) {
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 04143c08bd6e..b0e89ca48a3c 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3053,7 +3053,7 @@ static blk_status_t do_dasd_request(struct blk_mq_hw_ctx 
*hctx,
  *
  * Return values:
  * BLK_EH_RESET_TIMER if the request should be left running
- * BLK_EH_NOT_HANDLED if the request is handled or terminated
+ * BLK_EH_DONE if the request is handled or terminated
  *   by the driver.
  */
 enum blk_eh_timer_return dasd_times_out(struct request *req, bool reserved)
@@ -3065,7 +3065,7 @@ enum blk_eh_timer_return dasd_times_out(struct request 
*req, bool reserved)
int rc = 0;
 
if (!cqr)
-   return BLK_EH_NOT_HANDLED;
+   return BLK_EH_DONE;
 
spin_lock_irqsave(>dq->lock, flags);
device = cqr->startdev ? cqr->startdev : block->base;
@@ -3124,7 +3124,7 @@ enum blk_eh_timer_return dasd_times_out(struct request 
*req, bool