Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

[linux-2.6] / fs / sysfs / sysfs.h

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 2a68bfa46e43c78bc6bdb26df8988525889dfc26..ce4e15f8aaebce521b4e8b4469c5923307cedad3 100644 (file)
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -1,6 +1,20 @@
+/*
+ * fs/sysfs/sysfs.h - sysfs internal header file
+ *
+ * Copyright (c) 2001-3 Patrick Mochel
+ * Copyright (c) 2007 SUSE Linux Products GmbH
+ * Copyright (c) 2007 Tejun Heo <teheo@suse.de>
+ *
+ * This file is released under the GPLv2.
+ */
+
+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;
 };
 
 struct sysfs_elem_symlink {
@@ -9,6 +23,7 @@ struct sysfs_elem_symlink {
 
 struct sysfs_elem_attr {
        struct attribute        *attr;
+       struct sysfs_open_dirent *open;
 };
 
 struct sysfs_elem_bin_attr {
@@ -28,7 +43,6 @@ struct sysfs_dirent {
        atomic_t                s_active;
        struct sysfs_dirent     *s_parent;
        struct sysfs_dirent     *s_sibling;
-       struct sysfs_dirent     *s_children;
        const char              *s_name;
 
        union {
@@ -42,17 +56,15 @@ struct sysfs_dirent {
        ino_t                   s_ino;
        umode_t                 s_mode;
        struct iattr            *s_iattr;
-       atomic_t                s_event;
 };
 
 #define SD_DEACTIVATED_BIAS            INT_MIN
 
 #define SYSFS_TYPE_MASK                        0x00ff
-#define SYSFS_ROOT                     0x0001
-#define SYSFS_DIR                      0x0002
-#define SYSFS_KOBJ_ATTR                        0x0004
-#define SYSFS_KOBJ_BIN_ATTR            0x0008
-#define SYSFS_KOBJ_LINK                        0x0020
+#define SYSFS_DIR                      0x0001
+#define SYSFS_KOBJ_ATTR                        0x0002
+#define SYSFS_KOBJ_BIN_ATTR            0x0004
+#define SYSFS_KOBJ_LINK                        0x0008
 #define SYSFS_COPY_NAME                        (SYSFS_DIR | SYSFS_KOBJ_LINK)
 
 #define SYSFS_FLAG_MASK                        ~SYSFS_TYPE_MASK
@@ -91,8 +103,6 @@ extern const struct file_operations sysfs_dir_operations;
 extern const struct inode_operations sysfs_dir_inode_operations;
 
 struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd);
-struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd);
-void sysfs_put_active(struct sysfs_dirent *sd);
 struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd);
 void sysfs_put_active_two(struct sysfs_dirent *sd);
 void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt,
@@ -134,6 +144,7 @@ static inline void sysfs_put(struct sysfs_dirent *sd)
 struct inode *sysfs_get_inode(struct sysfs_dirent *sd);
 int sysfs_setattr(struct dentry *dentry, struct iattr *iattr);
 int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name);
+int sysfs_inode_init(void);
 
 /*
  * file.c
@@ -143,6 +154,8 @@ extern const struct file_operations sysfs_file_operations;
 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);
 /*
  * bin.c
  */