scsi: core: Improve warning message in scsi_device_block()

If __scsi_internal_device_block() returns an error, it is always -EINVAL
because of an invalid state transition. For debugging purposes, it makes
more sense to print the device state.

Signed-off-by: Martin Wilck <mwilck@suse.com>
Link: https://lore.kernel.org/r/20230614103616.31857-8-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 55a327b..ea21e11 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2784,9 +2784,11 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_block_nowait);
 static void scsi_device_block(struct scsi_device *sdev, void *data)
 {
        int err;
+       enum scsi_device_state state;
 
        mutex_lock(&sdev->state_mutex);
        err = __scsi_internal_device_block_nowait(sdev);
+       state = sdev->sdev_state;
        if (err == 0)
                /*
                 * scsi_stop_queue() must be called with the state_mutex
@@ -2797,8 +2799,8 @@ static void scsi_device_block(struct scsi_device *sdev, void *data)
 
        mutex_unlock(&sdev->state_mutex);
 
-       WARN_ONCE(err, "__scsi_internal_device_block_nowait(%s) failed: err = %d\n",
-                 dev_name(&sdev->sdev_gendev), err);
+       WARN_ONCE(err, "%s: failed to block %s in state %d\n",
+                 __func__, dev_name(&sdev->sdev_gendev), state);
 }
 
 /**