sysfs: propagate umode_t

[sfrench/cifs-2.6.git] / fs / sysfs / sysfs.h

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 845ab3ad229d60616807bb39f0adaceb73a3ad8e..7484a36ee67863f7bc28c2a053104480b92456c5 100644 (file)
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -11,14 +11,18 @@
 #include <linux/lockdep.h>
 #include <linux/kobject_ns.h>
 #include <linux/fs.h>
+#include <linux/rbtree.h>
 
 struct sysfs_open_dirent;
 
 /* type-specific structures for sysfs_dirent->s_* union members */
 struct sysfs_elem_dir {
        struct kobject          *kobj;
-       /* children list starts here and goes through sd->s_sibling */
-       struct sysfs_dirent     *children;
+
+       unsigned long           subdirs;
+
+       struct rb_root          inode_tree;
+       struct rb_root          name_tree;
 };
 
 struct sysfs_elem_symlink {
@@ -56,9 +60,16 @@ struct sysfs_dirent {
        struct lockdep_map      dep_map;
 #endif
        struct sysfs_dirent     *s_parent;
-       struct sysfs_dirent     *s_sibling;
        const char              *s_name;
 
+       struct rb_node          inode_node;
+       struct rb_node          name_node;
+
+       union {
+               struct completion       *completion;
+               struct sysfs_dirent     *removed_list;
+       } u;
+
        const void              *s_ns; /* namespace tag */
        union {
                struct sysfs_elem_dir           s_dir;
@@ -68,7 +79,7 @@ struct sysfs_dirent {
        };
 
        unsigned int            s_flags;
-       unsigned short          s_mode;
+       umode_t                 s_mode;
        ino_t                   s_ino;
        struct sysfs_inode_attrs *s_iattr;
 };
@@ -218,7 +229,7 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd,
                   const struct attribute *attr, int type);
 
 int sysfs_add_file_mode(struct sysfs_dirent *dir_sd,
-                       const struct attribute *attr, int type, mode_t amode);
+                       const struct attribute *attr, int type, umode_t amode);
 /*
  * bin.c
  */