scsi_get_vpd_page() has a check for 'skip_vpd_pages'. However,
this is not sufficient to test if the device really supports
VPD pages. At the same time, most sites were already calling
scsi_device_supports_vpd() prior to calling this function.
So this patchs updates all callers to use scsi_device_supports_vpd()
prior to calling scsi_get_vpd_page() and remove the check
to skip_vpd_pages.
Signed-off-by: Hannes Reinecke <hare@xxxxxxxx>
---
drivers/scsi/scsi.c | 5 ++---
drivers/scsi/scsi_transport_sas.c | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 1ff4a0b..f054878 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -727,15 +727,14 @@ static int scsi_vpd_inquiry(struct scsi_device *sdev, unsigned char *buffer,
* to a buffer containing the data from that page. The caller is
* responsible for calling kfree() on this pointer when it is no longer
* needed. If we cannot retrieve the VPD page this routine returns %NULL.
+ * The caller is responsible for checking if the device supports VPD
+ * pages prior to calling this function.
*/
int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
int buf_len)
{
int i, result;
- if (sdev->skip_vpd_pages)
- goto fail;
-
/* Ask for all the pages supported by this device */
result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
if (result < 4)
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 3f0ff07..b2616eb 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -412,7 +412,8 @@ sas_tlr_supported(struct scsi_device *sdev)
char *buffer = kzalloc(vpd_len, GFP_KERNEL);
int ret = 0;
- if (scsi_get_vpd_page(sdev, 0x90, buffer, vpd_len))
+ if (!scsi_device_supports_vpd(sdev) ||
+ scsi_get_vpd_page(sdev, 0x90, buffer, vpd_len))
goto out;
/*
--
1.8.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
