scsi: core: Use SCSI_SCAN_RESCAN in __scsi_add_device()

Instead of using hardcoded '1' as the __scsi_add_device() ->
scsi_probe_and_add_lun() rescan arg, use proper macro SCSI_SCAN_RESCAN.

Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20221121121725.1910795-2-john.g.garry@oracle.com
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 5d27f5196de6fd49537ba29d9d3814207380e0ea..6cc974b382c1b2e6d135c55238268b76ad73b26c 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1580,7 +1580,8 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
                scsi_complete_async_scans();
 
        if (scsi_host_scan_allowed(shost) && scsi_autopm_get_host(shost) == 0) {
-               scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata);
+               scsi_probe_and_add_lun(starget, lun, NULL, &sdev,
+                                      SCSI_SCAN_RESCAN, hostdata);
                scsi_autopm_put_host(shost);
        }
        mutex_unlock(&shost->scan_mutex);