Commit 3beeabd5 authored by David Disseldorp's avatar David Disseldorp Committed by Martin K. Petersen
Browse files

scsi: target: perform t10_wwn ID initialisation in target_alloc_device() 



Initialise the t10_wwn vendor, model and revision defaults when a device is
allocated instead of when it's enabled. This ensures that custom vendor or
model strings set prior to enablement are not later overwritten with
default values.

The TRANSPORT_FLAG_PASSTHROUGH conditional can be dropped for the following
reasons:

 - target_core_pscsi overwrites the defaults in the
   pscsi_configure_device() callback.
   + the contents is then only used for ConfigFS via
     $pscsi_dev/statistics/scsi_lu/vend, etc.

 - target_core_user doesn't touch the defaults, nor are they used for
   anything outside of ConfigFS.

Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
Reviewed-by: default avatarRoman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2d882847

drivers/target/target_core_device.c

+7 −14
Original line number Diff line number Diff line
@@ -810,6 +810,13 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) 
	mutex_init(&xcopy_lun->lun_tg_pt_md_mutex);

	xcopy_lun->lun_tpg = &xcopy_pt_tpg;



	/* Preload the default INQUIRY const values */

	strlcpy(dev->t10_wwn.vendor, "LIO-ORG", sizeof(dev->t10_wwn.vendor));

	strlcpy(dev->t10_wwn.model, dev->transport->inquiry_prod,

		sizeof(dev->t10_wwn.model));

	strlcpy(dev->t10_wwn.revision, dev->transport->inquiry_rev,

		sizeof(dev->t10_wwn.revision));



	return dev;

}
@@ -972,20 +979,6 @@ int target_configure_device(struct se_device *dev) 
	 */

	INIT_WORK(&dev->qf_work_queue, target_qf_do_work);



	/*

	 * Preload the initial INQUIRY const values if we are doing

	 * anything virtual (IBLOCK, FILEIO, RAMDISK), but not for TCM/pSCSI

	 * passthrough because this is being provided by the backend LLD.

	 */

	if (!(dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)) {

		strlcpy(dev->t10_wwn.vendor, "LIO-ORG",

			sizeof(dev->t10_wwn.vendor));

		strlcpy(dev->t10_wwn.model, dev->transport->inquiry_prod,

			sizeof(dev->t10_wwn.model));

		strlcpy(dev->t10_wwn.revision, dev->transport->inquiry_rev,

			sizeof(dev->t10_wwn.revision));

	}



	scsi_dump_inquiry(dev);



	spin_lock(&hba->device_lock);