scsi: core: Merge scsi_internal_device_block() and device_block()

scsi_internal_device_block() is only called from device_block().  Merge the
two functions, and call the result scsi_device_block(), as the name
device_block() is confusingly generic.

Signed-off-by: Martin Wilck <mwilck@suse.com>
Link: https://lore.kernel.org/r/20230614103616.31857-4-mwilck@suse.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b7c569a..357eb0a 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2775,13 +2775,12 @@ int scsi_internal_device_block_nowait(struct scsi_device *sdev)
 EXPORT_SYMBOL_GPL(scsi_internal_device_block_nowait);
 
 /**
- * scsi_internal_device_block - try to transition to the SDEV_BLOCK state
+ * scsi_device_block - try to transition to the SDEV_BLOCK state
  * @sdev: device to block
+ * @data: dummy argument, ignored
  *
  * Pause SCSI command processing on the specified device and wait until all
- * ongoing scsi_request_fn() / scsi_queue_rq() calls have finished. May sleep.
- *
- * Returns zero if successful or a negative error code upon failure.
+ * ongoing scsi_queue_rq() calls have finished. May sleep.
  *
  * Note:
  * This routine transitions the device to the SDEV_BLOCK state (which must be
@@ -2789,7 +2788,7 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_block_nowait);
  * is paused until the device leaves the SDEV_BLOCK state. See also
  * scsi_internal_device_unblock().
  */
-static int scsi_internal_device_block(struct scsi_device *sdev)
+static void scsi_device_block(struct scsi_device *sdev, void *data)
 {
        int err;
 
@@ -2799,7 +2798,8 @@ static int scsi_internal_device_block(struct scsi_device *sdev)
                scsi_stop_queue(sdev, false);
        mutex_unlock(&sdev->state_mutex);
 
-       return err;
+       WARN_ONCE(err, "__scsi_internal_device_block_nowait(%s) failed: err = %d\n",
+                 dev_name(&sdev->sdev_gendev), err);
 }
 
 /**
@@ -2882,23 +2882,12 @@ static int scsi_internal_device_unblock(struct scsi_device *sdev,
        return ret;
 }
 
-static void
-device_block(struct scsi_device *sdev, void *data)
-{
-       int ret;
-
-       ret = scsi_internal_device_block(sdev);
-
-       WARN_ONCE(ret, "scsi_internal_device_block(%s) failed: ret = %d\n",
-                 dev_name(&sdev->sdev_gendev), ret);
-}
-
 static int
 target_block(struct device *dev, void *data)
 {
        if (scsi_is_target_device(dev))
                starget_for_each_device(to_scsi_target(dev), NULL,
-                                       device_block);
+                                       scsi_device_block);
        return 0;
 }
 
@@ -2907,7 +2896,7 @@ scsi_target_block(struct device *dev)
 {
        if (scsi_is_target_device(dev))
                starget_for_each_device(to_scsi_target(dev), NULL,
-                                       device_block);
+                                       scsi_device_block);
        else
                device_for_each_child(dev, NULL, target_block);
 }