Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[mv-sheeva.git] / fs / configfs / configfs_internal.h

diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h
index 7b48c034b312128cbf64fe2094aa7155b5323fdb..3b0185fdf9a4c8834dc0e669a68cffe84ec12ece 100644 (file)
--- a/fs/configfs/configfs_internal.h
+++ b/fs/configfs/configfs_internal.h
@@ -29,10 +29,11 @@
 
 struct configfs_dirent {
        atomic_t                s_count;
+       int                     s_dependent_count;
        struct list_head        s_sibling;
        struct list_head        s_children;
        struct list_head        s_links;
-       void                    * s_element;
+       void                    * s_element;
        int                     s_type;
        umode_t                 s_mode;
        struct dentry           * s_dentry;
@@ -41,8 +42,8 @@ struct configfs_dirent {
 
 #define CONFIGFS_ROOT          0x0001
 #define CONFIGFS_DIR           0x0002
-#define CONFIGFS_ITEM_ATTR     0x0004
-#define CONFIGFS_ITEM_LINK     0x0020
+#define CONFIGFS_ITEM_ATTR     0x0004
+#define CONFIGFS_ITEM_LINK     0x0020
 #define CONFIGFS_USET_DIR      0x0040
 #define CONFIGFS_USET_DEFAULT  0x0080
 #define CONFIGFS_USET_DROPPING 0x0100