lkml.org 
[lkml]   [2007]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 42/75] sysfs: Make sysfs_mount static
    Date
    From: Eric W. Biederman <ebiederm@xmission.com>

    This patch modifies the users of sysfs_mount to use sysfs_root
    instead (which is what they are looking for). It then
    makes sysfs_mount static to keep people from using it
    by accident.

    The net result is slightly faster and cleaner code.

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/sysfs/dir.c | 4 +---
    fs/sysfs/mount.c | 2 +-
    fs/sysfs/symlink.c | 7 +++----
    fs/sysfs/sysfs.h | 1 -
    4 files changed, 5 insertions(+), 9 deletions(-)

    diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
    index 739dda1..7f4abe1 100644
    --- a/fs/sysfs/dir.c
    +++ b/fs/sysfs/dir.c
    @@ -737,10 +737,8 @@ int sysfs_create_dir(struct kobject * kobj)

    if (kobj->parent)
    parent_sd = kobj->parent->sd;
    - else if (sysfs_mount && sysfs_mount->mnt_sb)
    - parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;
    else
    - return -EFAULT;
    + parent_sd = &sysfs_root;

    error = create_dir(kobj, parent_sd, kobject_name(kobj), &sd);
    if (!error)
    diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
    index ac76256..8989cbb 100644
    --- a/fs/sysfs/mount.c
    +++ b/fs/sysfs/mount.c
    @@ -14,7 +14,7 @@
    /* Random magic number */
    #define SYSFS_MAGIC 0x62656572

    -struct vfsmount *sysfs_mount;
    +static struct vfsmount *sysfs_mount;
    struct super_block * sysfs_sb = NULL;
    struct kmem_cache *sysfs_dir_cachep;

    diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
    index a6b13f1..8ad38bc 100644
    --- a/fs/sysfs/symlink.c
    +++ b/fs/sysfs/symlink.c
    @@ -60,10 +60,9 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char

    BUG_ON(!name);

    - if (!kobj) {
    - if (sysfs_mount && sysfs_mount->mnt_sb)
    - parent_sd = sysfs_mount->mnt_sb->s_root->d_fsdata;
    - } else
    + if (!kobj)
    + parent_sd = &sysfs_root;
    + else
    parent_sd = kobj->sd;

    error = -EFAULT;
    diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
    index 8a0aea1..77253aa 100644
    --- a/fs/sysfs/sysfs.h
    +++ b/fs/sysfs/sysfs.h
    @@ -51,7 +51,6 @@ struct sysfs_addrm_cxt {
    int cnt;
    };

    -extern struct vfsmount * sysfs_mount;
    extern struct sysfs_dirent sysfs_root;
    extern struct kmem_cache *sysfs_dir_cachep;

    --
    1.5.3.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-10-13 00:45    [W:0.699 / U:0.232 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site