Commit 2d882847 authored by David Disseldorp's avatar David Disseldorp Committed by Martin K. Petersen
Browse files

scsi: target: remove hardcoded T10 Vendor ID in INQUIRY response 



Use the value stored in t10_wwn.vendor, which defaults to "LIO-ORG", but
can be reconfigured via the vendor_id ConfigFS attribute.

Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
Reviewed-by: default avatarBryant G. Ly <bly@catalogicsoftware.com>
Reviewed-by: default avatarLee Duncan <lduncan@suse.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarRoman Bolshakov <r.bolshakov@yadro.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 54a6f3f6

drivers/target/target_core_spc.c

+5 −3
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf) 
	 */

	memset(&buf[8], 0x20,

	       INQUIRY_VENDOR_LEN + INQUIRY_MODEL_LEN + INQUIRY_REVISION_LEN);

	memcpy(&buf[8], "LIO-ORG", sizeof("LIO-ORG") - 1);

	memcpy(&buf[8], dev->t10_wwn.vendor,

	       strnlen(dev->t10_wwn.vendor, INQUIRY_VENDOR_LEN));

	memcpy(&buf[16], dev->t10_wwn.model,

	       strnlen(dev->t10_wwn.model, INQUIRY_MODEL_LEN));

	memcpy(&buf[32], dev->t10_wwn.revision,
@@ -258,8 +259,9 @@ spc_emulate_evpd_83(struct se_cmd *cmd, unsigned char *buf) 
	buf[off+1] = 0x1; /* T10 Vendor ID */

	buf[off+2] = 0x0;

	/* left align Vendor ID and pad with spaces */

	memset(&buf[off+4], 0x20, 8);

	memcpy(&buf[off+4], "LIO-ORG", sizeof("LIO-ORG") - 1);

	memset(&buf[off+4], 0x20, INQUIRY_VENDOR_LEN);

	memcpy(&buf[off+4], dev->t10_wwn.vendor,

	       strnlen(dev->t10_wwn.vendor, INQUIRY_VENDOR_LEN));

	/* Extra Byte for NULL Terminator */

	id_len++;

	/* Identifier Length */