lkml.org 
[lkml]   [2009]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 18/24] sysfs: Pass super_block to sysfs_get_inode
    From: Eric W. Biederman <ebiederm@xmission.com>

    Currently sysfs_get_inode magically returns an inode on
    sysfs_sb. Make the super_block parameter explicit and
    the code becomes clearer.

    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
    ---
    fs/sysfs/dir.c | 2 +-
    fs/sysfs/inode.c | 5 +++--
    fs/sysfs/mount.c | 2 +-
    fs/sysfs/sysfs.h | 2 +-
    4 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
    index 1f8fb9c..39c6944 100644
    --- a/fs/sysfs/dir.c
    +++ b/fs/sysfs/dir.c
    @@ -579,7 +579,7 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
    }

    /* attach dentry and inode */
    - inode = sysfs_get_inode(sd);
    + inode = sysfs_get_inode(dir->i_sb, sd);
    if (!inode) {
    ret = ERR_PTR(-ENOMEM);
    goto out_unlock;
    diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
    index a1917b5..c725aeb 100644
    --- a/fs/sysfs/inode.c
    +++ b/fs/sysfs/inode.c
    @@ -210,6 +210,7 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)

    /**
    * sysfs_get_inode - get inode for sysfs_dirent
    + * @sb: super block
    * @sd: sysfs_dirent to allocate inode for
    *
    * Get inode for @sd. If such inode doesn't exist, a new inode
    @@ -222,11 +223,11 @@ static void sysfs_init_inode(struct sysfs_dirent *sd, struct inode *inode)
    * RETURNS:
    * Pointer to allocated inode on success, NULL on failure.
    */
    -struct inode * sysfs_get_inode(struct sysfs_dirent *sd)
    +struct inode * sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd)
    {
    struct inode *inode;

    - inode = iget_locked(sysfs_sb, sd->s_ino);
    + inode = iget_locked(sb, sd->s_ino);
    if (inode && (inode->i_state & I_NEW))
    sysfs_init_inode(sd, inode);

    diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
    index 4974995..89db07e 100644
    --- a/fs/sysfs/mount.c
    +++ b/fs/sysfs/mount.c
    @@ -54,7 +54,7 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)

    /* get root inode, initialize and unlock it */
    mutex_lock(&sysfs_mutex);
    - inode = sysfs_get_inode(&sysfs_root);
    + inode = sysfs_get_inode(sb, &sysfs_root);
    mutex_unlock(&sysfs_mutex);
    if (!inode) {
    pr_debug("sysfs: could not get root inode\n");
    diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
    index 2db952c..cf21b06 100644
    --- a/fs/sysfs/sysfs.h
    +++ b/fs/sysfs/sysfs.h
    @@ -130,7 +130,7 @@ static inline void __sysfs_put(struct sysfs_dirent *sd)
    /*
    * inode.c
    */
    -struct inode *sysfs_get_inode(struct sysfs_dirent *sd);
    +struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd);
    void sysfs_delete_inode(struct inode *inode);
    int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr);
    int sysfs_setattr(struct dentry *dentry, struct iattr *iattr);
    --
    1.6.3.1.54.g99dd.dirty


    \
     
     \ /
      Last update: 2009-05-29 01:11    [W:0.028 / U:29.960 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site