| Message ID | 1377193513-19532-2-git-send-email-luis.henriques@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 08/22/2013 10:45 AM, Luis Henriques wrote: > From: "Martin K. Petersen" <martin.petersen@oracle.com> > > BugLink: http://bugs.launchpad.net/bugs/1215155 > > 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> > (cherry picked from commit 7562523e84ddc742fe1f9db8bd76b01acca89f6b) > Signed-off-by: Luis Henriques <luis.henriques@canonical.com> > --- > drivers/scsi/scsi.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c > index 3b1ea34..eaa808e 100644 > --- a/drivers/scsi/scsi.c > +++ b/drivers/scsi/scsi.c > @@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf, > { > 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) >
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 3b1ea34..eaa808e 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf, { 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)