[PATCH 03/14] sysfs: move sysfs_get_kobject() and release_sysfs_dirent() to dir.c

[Tejun Heo]

There is no reason these functions should be inlined and soon to
follow sysfs object reference simplification will make these functions
heavier.  Move them to dir.c.

Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
---
 fs/sysfs/dir.c   |   30 ++++++++++++++++++++++++++++++
 fs/sysfs/sysfs.h |   32 ++------------------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 5112f88..8b1a00a 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -14,6 +14,36 @@
 
 DECLARE_RWSEM(sysfs_rename_sem);
 
+struct kobject *sysfs_get_kobject(struct dentry *dentry)
+{
+       struct kobject * kobj = NULL;
+
+       spin_lock(&dcache_lock);
+       if (!d_unhashed(dentry)) {
+               struct sysfs_dirent * sd = dentry->d_fsdata;
+               if (sd->s_type & SYSFS_KOBJ_LINK) {
+                       struct sysfs_symlink * sl = sd->s_element;
+                       kobj = kobject_get(sl->target_kobj);
+               } else
+                       kobj = kobject_get(sd->s_element);
+       }
+       spin_unlock(&dcache_lock);
+
+       return kobj;
+}
+
+void release_sysfs_dirent(struct sysfs_dirent * sd)
+{
+       if (sd->s_type & SYSFS_KOBJ_LINK) {
+               struct sysfs_symlink * sl = sd->s_element;
+               kfree(sl->link_name);
+               kobject_put(sl->target_kobj);
+               kfree(sl);
+       }
+       kfree(sd->s_iattr);
+       kmem_cache_free(sysfs_dir_cachep, sd);
+}
+
 static void sysfs_d_iput(struct dentry * dentry, struct inode * inode)
 {
        struct sysfs_dirent * sd = dentry->d_fsdata;
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index a77c57e..812c8c3 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -17,6 +17,8 @@ extern void sysfs_delete_inode(struct inode *inode);
 extern struct inode * sysfs_new_inode(mode_t mode, struct sysfs_dirent *);
 extern int sysfs_create(struct dentry *, int mode, int (*init)(struct inode 
*));
 
+extern struct kobject *sysfs_get_kobject(struct dentry *dentry);
+extern void release_sysfs_dirent(struct sysfs_dirent * sd);
 extern int sysfs_dirent_exist(struct sysfs_dirent *, const unsigned char *);
 extern int sysfs_make_dirent(struct sysfs_dirent *, struct dentry *, void *,
                                umode_t, int);
@@ -79,36 +81,6 @@ static inline struct bin_attribute * to_bin_attr(struct 
dentry * dentry)
        return ((struct bin_attribute *) sd->s_element);
 }
 
-static inline struct kobject *sysfs_get_kobject(struct dentry *dentry)
-{
-       struct kobject * kobj = NULL;
-
-       spin_lock(&dcache_lock);
-       if (!d_unhashed(dentry)) {
-               struct sysfs_dirent * sd = dentry->d_fsdata;
-               if (sd->s_type & SYSFS_KOBJ_LINK) {
-                       struct sysfs_symlink * sl = sd->s_element;
-                       kobj = kobject_get(sl->target_kobj);
-               } else
-                       kobj = kobject_get(sd->s_element);
-       }
-       spin_unlock(&dcache_lock);
-
-       return kobj;
-}
-
-static inline void release_sysfs_dirent(struct sysfs_dirent * sd)
-{
-       if (sd->s_type & SYSFS_KOBJ_LINK) {
-               struct sysfs_symlink * sl = sd->s_element;
-               kfree(sl->link_name);
-               kobject_put(sl->target_kobj);
-               kfree(sl);
-       }
-       kfree(sd->s_iattr);
-       kmem_cache_free(sysfs_dir_cachep, sd);
-}
-
 static inline struct sysfs_dirent * sysfs_get(struct sysfs_dirent * sd)
 {
        if (sd) {
-- 
1.5.0.3


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