scsi: core: Improve type safety of scsi_rescan_device()
Subsystems (6)
PATCH 1/1 scsi: core: Improve type safety of scsi_rescan_device()
Most callers of scsi_rescan_device() have the scsi_device pointer available. Pass a struct scsi_device pointer to scsi_rescan_device() instead of a struct device pointer. This change prevents that a pointer to another struct device pointer would be passed accidentally to scsi_rescan_device().
Remove the scsi_rescan_device() declaration from the scsi_priv.h header file since it duplicates the declaration in <scsi/scsi_host.h>.
--- drivers/ata/libata-scsi.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/mvumi.c | 2 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_scan.c | 4 ++-- drivers/scsi/scsi_sysfs.c | 4 ++-- drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/storvsc_drv.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- include/scsi/scsi_host.h | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-)
drivers/ata/libata-scsi.c +1 -1
@@ -4884,7 +4884,7 @@ void ata_scsi_dev_rescan(struct work_struct *work) }spin_unlock_irqrestore (ap->lock, flags); -scsi_rescan_device (&(sdev->sdev_gendev)); +scsi_rescan_device (sdev);scsi_device_put (sdev);spin_lock_irqsave (ap->lock, flags); }
drivers/scsi/aacraid/commsup.c +1 -1
@@ -1451,7 +1451,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)#endif break ; } -scsi_rescan_device (&device->sdev_gendev); +scsi_rescan_device (device);break ;default :
drivers/scsi/mvumi.c +1 -1
@@ -1500,7 +1500,7 @@ static void mvumi_rescan_devices(struct mvumi_hba *mhba, int id) sdev =scsi_device_lookup (mhba->shost,0 , id,0 );if (sdev) { -scsi_rescan_device (&sdev->sdev_gendev); +scsi_rescan_device (sdev);scsi_device_put (sdev); } }
drivers/scsi/scsi_lib.c +1 -1
@@ -2445,7 +2445,7 @@ static void scsi_evt_emit(struct scsi_device *sdev, struct scsi_event *evt) envp[idx++] ="SDEV_MEDIA_CHANGE=1" ;break ;case SDEV_EVT_INQUIRY_CHANGE_REPORTED : -scsi_rescan_device (&sdev->sdev_gendev); +scsi_rescan_device (sdev); envp[idx++] ="SDEV_UA=INQUIRY_DATA_HAS_CHANGED" ;break ;case SDEV_EVT_CAPACITY_CHANGE_REPORTED :
drivers/scsi/scsi_priv.h +0 -1
@@ -138,7 +138,6 @@ extern int scsi_complete_async_scans(void);extern int scsi_scan_host_selected (struct Scsi_Host *,unsigned int ,unsigned int ,u64 ,enum scsi_scan_mode );extern void scsi_forget_host (struct Scsi_Host *); -extern void scsi_rescan_device (struct device *);/* scsi_sysctl.c */ #ifdef CONFIG_SYSCTL
drivers/scsi/scsi_scan.c +2 -2
@@ -1622,9 +1622,9 @@ int scsi_add_device(struct Scsi_Host *host, uint channel, }EXPORT_SYMBOL (scsi_add_device); -void scsi_rescan_device (struct device *dev) +void scsi_rescan_device (struct scsi_device *sdev) { -struct scsi_device *sdev =to_scsi_device (dev); +struct device *dev = &sdev->sdev_gendev;device_lock (dev);
drivers/scsi/scsi_sysfs.c +2 -2
@@ -747,7 +747,7 @@ static ssize_t store_rescan_field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { -scsi_rescan_device (dev); +scsi_rescan_device (to_scsi_device(dev ));return count; } static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field);
@@ -840,7 +840,7 @@ store_state_field(struct device *dev, struct device_attribute *attr,* waiting for pending I/O to finish. */ blk_mq_run_hw_queues (sdev->request_queue, true); -scsi_rescan_device (dev); +scsi_rescan_device (sdev); }return ret ==0 ? count : -EINVAL ;
drivers/scsi/smartpqi/smartpqi_init.c +1 -1
@@ -2257,7 +2257,7 @@ static void pqi_update_device_list(struct pqi_ctrl_info *ctrl_info, device->advertised_queue_depth = device->queue_depth;scsi_change_queue_depth (device->sdev, device->advertised_queue_depth);if (device->rescan) { -scsi_rescan_device (&device->sdev->sdev_gendev); +scsi_rescan_device (device->sdev); device->rescan = false; } }
drivers/scsi/storvsc_drv.c +1 -1
@@ -470,7 +470,7 @@ static void storvsc_device_scan(struct work_struct *work) sdev =scsi_device_lookup (wrk->host,0 , wrk->tgt_id, wrk->lun);if (!sdev) goto done; -scsi_rescan_device (&sdev->sdev_gendev); +scsi_rescan_device (sdev);scsi_device_put (sdev); done:
drivers/scsi/virtio_scsi.c +1 -1
@@ -325,7 +325,7 @@ static void virtscsi_handle_param_change(struct virtio_scsi *vscsi,/* Handle "Parameters changed", "Mode parameters changed", and "Capacity data has changed". */ if (asc ==0x2a && (ascq ==0x00 || ascq ==0x01 || ascq ==0x09 )) -scsi_rescan_device (&sdev->sdev_gendev); +scsi_rescan_device (sdev);scsi_device_put (sdev); }
include/scsi/scsi_host.h +1 -1
@@ -764,7 +764,7 @@ scsi_template_proc_dir(const struct scsi_host_template *sht);#define scsi_template_proc_dir (sht) NULL#endif extern void scsi_scan_host (struct Scsi_Host *); -extern void scsi_rescan_device (struct device *); +extern void scsi_rescan_device (struct scsi_device *);extern void scsi_remove_host (struct Scsi_Host *);extern struct Scsi_Host *scsi_host_get (struct Scsi_Host *);extern int scsi_host_busy (struct Scsi_Host *shost);
Quoted 1 line · Bart Van Assche
Most callers of
scsi_rescan_device()have thescsi_devicepointer
s/Most/All ? If it is most, then you have an issue somewhere :)
Quoted 3 lines
available. Pass a struct
scsi_devicepointer toscsi_rescan_device()instead of a struct device pointer. This change prevents that a pointer to another struct device pointer would be passed accidentally to
...pointer to another struct device to be passed accidentally to...
Quoted 4 lines
scsi_rescan_device().Remove the
scsi_rescan_device()declaration from thescsi_priv.hheader file since it duplicates the declaration in <scsi/scsi_host.h>.
With the above nits fixed, feel free to add:
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 15 lines · Bart Van Assche
Most callers of
scsi_rescan_device()have thescsi_devicepointer available. Pass a structscsi_devicepointer toscsi_rescan_device()instead of a struct device pointer. This change prevents that a pointer to another struct device pointer would be passed accidentally toscsi_rescan_device().Remove the
scsi_rescan_device()declaration from thescsi_priv.hheader file since it duplicates the declaration in <scsi/scsi_host.h>.Cc Hannes Reinecke <[email protected]>Cc Damien Le Moal <[email protected]>Cc Mike Christie <[email protected]>Cc John Garry <[email protected]>Cc Ming Lei <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
Quoted 14 lines
--- drivers/ata/libata-scsi.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/mvumi.c | 2 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_scan.c | 4 ++-- drivers/scsi/scsi_sysfs.c | 4 ++-- drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/storvsc_drv.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- include/scsi/scsi_host.h | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
Quoted 2 lines · Bart Van Assche
Most callers of
scsi_rescan_device()have thescsi_devicepointer available.
Indirect response to Damien, I think that you mean "... have the scsi_device pointer readily available."
Quoted 5 lines
Pass a struct
scsi_devicepointer toscsi_rescan_device()instead of a struct device pointer. This change prevents that a pointer to another struct device pointer would be passed accidentally toscsi_rescan_device().
Looking back through history, I assume that scsi_rescan_device() was originally written to accept a device * because the only caller only had a device * available; and the function only required the device *. Then sdev->handler and vpd support was then added there, which was when the sdev pointer was required.
So ok, I suppose:
Quoted 41 lines
Remove the
scsi_rescan_device()declaration from thescsi_priv.hheader file since it duplicates the declaration in <scsi/scsi_host.h>.Cc Hannes Reinecke <[email protected]>Cc Damien Le Moal <[email protected]>Cc Mike Christie <[email protected]>Cc John Garry <[email protected]>Cc Ming Lei <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/ata/libata-scsi.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/mvumi.c | 2 +- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_scan.c | 4 ++-- drivers/scsi/scsi_sysfs.c | 4 ++-- drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/storvsc_drv.c | 2 +- drivers/scsi/virtio_scsi.c | 2 +- include/scsi/scsi_host.h | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-)drivers/ata/libata-scsi.c +1
-1@@ -4884,7 +4884,7 @@ void ata_scsi_dev_rescan(struct work_struct *work) }spin_unlock_irqrestore (ap->lock, flags); -scsi_rescan_device (&(sdev->sdev_gendev)); +scsi_rescan_device (sdev);scsi_device_put (sdev);spin_lock_irqsave (ap->lock, flags); }drivers/scsi/aacraid/commsup.c +0
-0
drivers/scsi/aacraid/commsup.c static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) · line 1454
Quoted 5 lines
drivers/scsi/aacraid/commsup.c +1
-1@@ -1451,7 +1451,7 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)#endif break ; } -scsi_rescan_device (&device->sdev_gendev); +scsi_rescan_device (device);
nit: how about change this code to have the variable named as sdev, not device? That name would be more consistent. That would not be a small change, so maybe not worth it.
Quoted 7 lines
drivers/scsi/aacraid/commsup.c +0
-0break ;default :drivers/scsi/mvumi.c +0
-0