scsi: Do not attach VPD to devices that don't support it
authorHannes Reinecke <hare@suse.de>
Fri, 1 Apr 2016 06:57:36 +0000 (08:57 +0200)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 5 Apr 2016 10:56:40 +0000 (06:56 -0400)
commit5ddfe0858ea7848c5d4efe3f4319e7543522e0ee
tree4875c6372247a37ac7fc4819db10713cd369f8b5
parentf08bb1e0dbdd0297258d0b8cd4dbfcc057e57b2a
scsi: Do not attach VPD to devices that don't support it

The patch "scsi: rescan VPD attributes" introduced a regression in which
devices that don't support VPD were being scanned for VPD attributes
anyway.  This could cause issues for some devices and should be avoided
so the check for scsi_level has been moved out of scsi_add_lun and into
scsi_attach_vpd so that all callers will not scan VPD for devices that
don't support it.

[mkp: Merge fix]

Fixes: 09e2b0b14690 ("scsi: rescan VPD attributes")
Cc: <stable@vger.kernel.org> #v4.5+
Suggested-by: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi.c
drivers/scsi/sd.c
include/scsi/scsi_device.h