lkml.org 
[lkml]   [2017]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 26/74] scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.
    3.2.94-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Maurizio Lombardi <mlombard@redhat.com>

    commit 62e62ffd95539b9220894a7900a619e0f3ef4756 upstream.

    The enclosure_add_device() function should fail if it can't create the
    relevant sysfs links.

    Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
    Tested-by: Douglas Miller <dougmill@linux.vnet.ibm.com>
    Acked-by: James Bottomley <jejb@linux.vnet.ibm.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/misc/enclosure.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/drivers/misc/enclosure.c
    +++ b/drivers/misc/enclosure.c
    @@ -320,6 +320,7 @@ int enclosure_add_device(struct enclosur
    struct device *dev)
    {
    struct enclosure_component *cdev;
    + int err;

    if (!edev || component >= edev->components)
    return -EINVAL;
    @@ -329,12 +330,17 @@ int enclosure_add_device(struct enclosur
    if (cdev->dev == dev)
    return -EEXIST;

    - if (cdev->dev)
    + if (cdev->dev) {
    enclosure_remove_links(cdev);
    -
    - put_device(cdev->dev);
    + put_device(cdev->dev);
    + }
    cdev->dev = get_device(dev);
    - return enclosure_add_links(cdev);
    + err = enclosure_add_links(cdev);
    + if (err) {
    + put_device(cdev->dev);
    + cdev->dev = NULL;
    + }
    + return err;
    }
    EXPORT_SYMBOL_GPL(enclosure_add_device);

    \
     
     \ /
      Last update: 2017-10-09 15:04    [W:4.061 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site