Commit 7562523e authored Jul 30, 2013 by Martin K. Petersen Committed by James Bottomley Aug 02, 2013

[SCSI] Don't attempt to send extended INQUIRY command if skip_vpd_pages is set



If a device has the skip_vpd_pages flag set we should simply fail the
scsi_get_vpd_page() call.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Stuart Foster <smf.linux@ntlworld.com>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent e09056b2

drivers/scsi/scsi.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device sdev, u8 page, unsigned char buf,
	{		{
	int i, result;		int i, result;

			if (sdev->skip_vpd_pages)
			goto fail;

	/* Ask for all the pages supported by this device */		/* Ask for all the pages supported by this device */
	result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);		result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
	if (result)		if (result)