| Message ID | 1663669630-21333-2-git-send-email-john.garry@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | libata/scsi/libsas: Allocate SCSI device earlier for ata port probe | expand |
On 9/20/22 19:27, John Garry wrote: > 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.garry@huawei.com> > --- > drivers/scsi/scsi_scan.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c > index ac6059702d13..3759b1a77504 100644 > --- a/drivers/scsi/scsi_scan.c > +++ b/drivers/scsi/scsi_scan.c > @@ -1588,7 +1588,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); Looks good. Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index ac6059702d13..3759b1a77504 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1588,7 +1588,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);
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.garry@huawei.com> --- drivers/scsi/scsi_scan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)