lkml.org 
[lkml]   [2007]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 5/5] sysfs: make sysfs_addrm_finish() return void
    Date
    From
    With the previous sysfs_add_one() update, there is only one user of
    the return value of sysfs_addrm_finish() and the user can switch to
    testing @sd easily. Make sysfs_addrm_finish() return void for cleaner
    semantics as suggested by Satyam Sharma.

    This patch doesn't introduce any noticeable behavior change.

    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Satyam Sharma <satyam.sharma@gmail.com>
    Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
    ---
    fs/sysfs/dir.c | 7 +------
    fs/sysfs/inode.c | 7 +++++--
    fs/sysfs/sysfs.h | 2 +-
    3 files changed, 7 insertions(+), 9 deletions(-)

    diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
    index 91934e1..3e5acc4 100644
    --- a/fs/sysfs/dir.c
    +++ b/fs/sysfs/dir.c
    @@ -609,11 +609,8 @@ static void sysfs_drop_dentry(struct sysfs_dirent *sd)
    *
    * LOCKING:
    * All mutexes acquired by sysfs_addrm_start() are released.
    - *
    - * RETURNS:
    - * Number of added/removed sysfs_dirents since sysfs_addrm_start().
    */
    -int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
    +void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
    {
    /* release resources acquired by sysfs_addrm_start() */
    mutex_unlock(&sysfs_mutex);
    @@ -639,8 +636,6 @@ int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt)
    sysfs_deactivate(sd);
    sysfs_put(sd);
    }
    -
    - return acxt->cnt;
    }

    /**
    diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
    index f05cda9..e74224e 100644
    --- a/fs/sysfs/inode.c
    +++ b/fs/sysfs/inode.c
    @@ -201,7 +201,10 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name)
    if (sd)
    sysfs_remove_one(&acxt, sd);

    - if (sysfs_addrm_finish(&acxt))
    + sysfs_addrm_finish(&acxt);
    +
    + if (sd)
    return 0;
    - return -ENOENT;
    + else
    + return -ENOENT;
    }
    diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
    index bb3f0c9..0436754 100644
    --- a/fs/sysfs/sysfs.h
    +++ b/fs/sysfs/sysfs.h
    @@ -66,7 +66,7 @@ extern int sysfs_add_one(struct sysfs_addrm_cxt *acxt,
    struct sysfs_dirent *sd);
    extern void sysfs_remove_one(struct sysfs_addrm_cxt *acxt,
    struct sysfs_dirent *sd);
    -extern int sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);
    +extern void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);

    extern struct inode * sysfs_get_inode(struct sysfs_dirent *sd);
    extern void sysfs_instantiate(struct dentry *dentry, struct inode *inode);
    --
    1.5.0.3

    -
    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-08-02 14:43    [W:0.025 / U:0.408 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site