lkml.org 
[lkml]   [2007]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/28] sysfs: kobject_put cleanup
    Date
    From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>

    This patch removes redundant argument checks for kobject_put().

    Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/sysfs/bin.c | 5 ++---
    fs/sysfs/file.c | 5 ++---
    2 files changed, 4 insertions(+), 6 deletions(-)

    diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
    index 9ec1c85..d3b9f5f 100644
    --- a/fs/sysfs/bin.c
    +++ b/fs/sysfs/bin.c
    @@ -147,7 +147,7 @@ static int open(struct inode * inode, struct file * file)
    Error:
    module_put(attr->attr.owner);
    Done:
    - if (error && kobj)
    + if (error)
    kobject_put(kobj);
    return error;
    }
    @@ -158,8 +158,7 @@ static int release(struct inode * inode, struct file * file)
    struct bin_attribute * attr = to_bin_attr(file->f_path.dentry);
    u8 * buffer = file->private_data;

    - if (kobj)
    - kobject_put(kobj);
    + kobject_put(kobj);
    module_put(attr->attr.owner);
    kfree(buffer);
    return 0;
    diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
    index cba4c1c..46618f8 100644
    --- a/fs/sysfs/file.c
    +++ b/fs/sysfs/file.c
    @@ -361,7 +361,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
    error = -EACCES;
    module_put(attr->owner);
    Done:
    - if (error && kobj)
    + if (error)
    kobject_put(kobj);
    return error;
    }
    @@ -375,8 +375,7 @@ static int sysfs_release(struct inode * inode, struct file * filp)

    if (buffer)
    remove_from_collection(buffer, inode);
    - if (kobj)
    - kobject_put(kobj);
    + kobject_put(kobj);
    /* After this point, attr should not be accessed. */
    module_put(owner);

    --
    1.4.4.4
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-08 01:39    [W:0.031 / U:89.804 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site