lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 099/128] scsi: core: scsi_get_device_flags_keyed(): Always return device flags
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bart Van Assche <bart.vanassche@wdc.com>


    [ Upstream commit a44c9d36509c83cf64f33b93f6ab2e63822c01eb ]

    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 28a0bc4120d3 ("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: Bart 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: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/scsi/scsi_devinfo.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    --- a/drivers/scsi/scsi_devinfo.c
    +++ b/drivers/scsi/scsi_devinfo.c
    @@ -590,17 +590,12 @@ blist_flags_t scsi_get_device_flags_keye
    int key)
    {
    struct scsi_dev_info_list *devinfo;
    - int err;

    devinfo = scsi_dev_info_list_find(vendor, model, key);
    if (!IS_ERR(devinfo))
    return devinfo->flags;

    - err = PTR_ERR(devinfo);
    - if (err != -ENOENT)
    - return err;
    -
    - /* nothing found, return nothing */
    + /* key or device not found: return nothing */
    if (key != SCSI_DEVINFO_GLOBAL)
    return 0;


    \
     
     \ /
      Last update: 2018-03-16 16:58    [W:3.906 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site