Commit ee79fc9f authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman

scsi: core: scsi_get_device_flags_keyed(): Always return device flags


[ Upstream commit a44c9d36 ]

Since scsi_get_device_flags_keyed() callers do not check whether or not
the returned value is an error code, change that function such that it
returns a flags value even if the 'key' argument is invalid.  Note:
since commit 28a0bc41 ("scsi: sd: Implement blacklist option for
WRITE SAME w/ UNMAP") bit 31 is a valid device information flag so
checking whether bit 31 is set in the return value is not sufficient to
tell the difference between an error code and a flags value.
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent abda3469
...@@ -589,17 +589,12 @@ int scsi_get_device_flags_keyed(struct scsi_device *sdev, ...@@ -589,17 +589,12 @@ int scsi_get_device_flags_keyed(struct scsi_device *sdev,
int key) int key)
{ {
struct scsi_dev_info_list *devinfo; struct scsi_dev_info_list *devinfo;
int err;
devinfo = scsi_dev_info_list_find(vendor, model, key); devinfo = scsi_dev_info_list_find(vendor, model, key);
if (!IS_ERR(devinfo)) if (!IS_ERR(devinfo))
return devinfo->flags; return devinfo->flags;
err = PTR_ERR(devinfo); /* key or device not found: return nothing */
if (err != -ENOENT)
return err;
/* nothing found, return nothing */
if (key != SCSI_DEVINFO_GLOBAL) if (key != SCSI_DEVINFO_GLOBAL)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment