Commit 79519528 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: core: Improve type safety of scsi_rescan_device() 



Most callers of scsi_rescan_device() have the scsi_device pointer readily
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 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>.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Cc: Mike Christie <michael.christie@oracle.com>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230822153043.4046244-1-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e1a87e29

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2458,7 +2458,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
Original line number Diff line number Diff line
@@ -137,7 +137,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