Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (61 commits)
  sysfs: add parameter "struct bin_attribute *" in .read/.write methods for sysfs binary attributes
  sysfs: make directory dentries and inodes reclaimable
  sysfs: implement sysfs_get_dentry()
  sysfs: move sysfs_drop_dentry() to dir.c and make it static
  sysfs: restructure add/remove paths and fix inode update
  sysfs: use sysfs_mutex to protect the sysfs_dirent tree
  sysfs: consolidate sysfs spinlocks
  sysfs: make kobj point to sysfs_dirent instead of dentry
  sysfs: implement sysfs_find_dirent() and sysfs_get_dirent()
  sysfs: implement SYSFS_FLAG_REMOVED flag
  sysfs: rename sysfs_dirent->s_type to s_flags and make room for flags
  sysfs: make sysfs_drop_dentry() access inodes using ilookup()
  sysfs: Fix oops in sysfs_drop_dentry on x86_64
  sysfs: use singly-linked list for sysfs_dirent tree
  sysfs: slim down sysfs_dirent->s_active
  sysfs: move s_active functions to fs/sysfs/dir.c
  sysfs: fix root sysfs_dirent -> root dentry association
  sysfs: use iget_locked() instead of new_inode()
  sysfs: reorganize sysfs_new_indoe() and sysfs_create()
  sysfs: fix parent refcounting during rename and move
  ...

1 files changed, 27 insertions, 28 deletions

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index 52eed2a7a5ef..f318b73c790c 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -18,26 +18,25 @@
 #include "sysfs.h"
 
 
-static void remove_files(struct dentry * dir, 
-                         const struct attribute_group * grp)
+static void remove_files(struct sysfs_dirent *dir_sd,
+                         const struct attribute_group *grp)
 {
         struct attribute *const* attr;
 
         for (attr = grp->attrs; *attr; attr++)
-                sysfs_hash_and_remove(dir,(*attr)->name);
+                sysfs_hash_and_remove(dir_sd, (*attr)->name);
 }
 
-static int create_files(struct dentry * dir,
-                        const struct attribute_group * grp)
+static int create_files(struct sysfs_dirent *dir_sd,
+                        const struct attribute_group *grp)
 {
         struct attribute *const* attr;
         int error = 0;
 
-        for (attr = grp->attrs; *attr && !error; attr++) {
-                error = sysfs_add_file(dir, *attr, SYSFS_KOBJ_ATTR);
-        }
+        for (attr = grp->attrs; *attr && !error; attr++)
+                error = sysfs_add_file(dir_sd, *attr, SYSFS_KOBJ_ATTR);
         if (error)
-                remove_files(dir,grp);
+                remove_files(dir_sd, grp);
         return error;
 }
 
@@ -45,44 +44,44 @@ static int create_files(struct dentry * dir,
 int sysfs_create_group(struct kobject * kobj, 
                        const struct attribute_group * grp)
 {
-        struct dentry * dir;
+        struct sysfs_dirent *sd;
         int error;
 
-        BUG_ON(!kobj || !kobj->dentry);
+        BUG_ON(!kobj || !kobj->sd);
 
         if (grp->name) {
-                error = sysfs_create_subdir(kobj,grp->name,&dir);
+                error = sysfs_create_subdir(kobj, grp->name, &sd);
                 if (error)
                         return error;
         } else
-                dir = kobj->dentry;
-        dir = dget(dir);
-        if ((error = create_files(dir,grp))) {
+                sd = kobj->sd;
+        sysfs_get(sd);
+        error = create_files(sd, grp);
+        if (error) {
                 if (grp->name)
-                        sysfs_remove_subdir(dir);
+                        sysfs_remove_subdir(sd);
         }
-        dput(dir);
+        sysfs_put(sd);
         return error;
 }
 
 void sysfs_remove_group(struct kobject * kobj, 
                         const struct attribute_group * grp)
 {
-        struct dentry * dir;
+        struct sysfs_dirent *dir_sd = kobj->sd;
+        struct sysfs_dirent *sd;
 
         if (grp->name) {
-                dir = lookup_one_len_kern(grp->name, kobj->dentry,
-                                strlen(grp->name));
-                BUG_ON(IS_ERR(dir));
-        }
-        else
-                dir = dget(kobj->dentry);
+                sd = sysfs_get_dirent(dir_sd, grp->name);
+                BUG_ON(!sd);
+        } else
+                sd = sysfs_get(dir_sd);
 
-        remove_files(dir,grp);
+        remove_files(sd, grp);
         if (grp->name)
-                sysfs_remove_subdir(dir);
-        /* release the ref. taken in this routine */
-        dput(dir);
+                sysfs_remove_subdir(sd);
+
+        sysfs_put(sd);
 }