aboutsummaryrefslogtreecommitdiffstats
path: root/fs/sysfs/sysfs.h
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-09-20 03:05:10 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 17:51:09 -0400
commit59f69015684b3de7b9472be9a81b1a978f93a496 (patch)
tree3d3f7880e9f0d9c867695b120944540e815f194a /fs/sysfs/sysfs.h
parentf88123eaf953f13a0c597dde54745d28f81236de (diff)
sysfs: clean up header files
sysfs is about to go through major overhaul making this a pretty good opportunity to clean up (out-of-tree changes and pending patches will need regeneration anyway). Clean up headers. * Kill space between * and symbolname. * Move SYSFS_* type constants and flags into fs/sysfs/sysfs.h. They're internal to sysfs. * Reformat function prototypes and add argument symbol names. * Make dummy function definition order match that of function prototypes. * Add some comments. * Reorganize fs/sysfs/sysfs.h according to which file the declared variable or feature lives in. This patch does not introduce any behavior change. Signed-off-by: Tejun Heo <htejun@gmail.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/sysfs/sysfs.h')
-rw-r--r--fs/sysfs/sysfs.h148
1 files changed, 92 insertions, 56 deletions
diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 791b3ed91a9b..63adbecc9ba4 100644
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -1,20 +1,24 @@
1/* type-specific structures for sysfs_dirent->s_* union members */
1struct sysfs_elem_dir { 2struct sysfs_elem_dir {
2 struct kobject * kobj; 3 struct kobject *kobj;
3}; 4};
4 5
5struct sysfs_elem_symlink { 6struct sysfs_elem_symlink {
6 struct sysfs_dirent * target_sd; 7 struct sysfs_dirent *target_sd;
7}; 8};
8 9
9struct sysfs_elem_attr { 10struct sysfs_elem_attr {
10 struct attribute * attr; 11 struct attribute *attr;
11}; 12};
12 13
13struct sysfs_elem_bin_attr { 14struct sysfs_elem_bin_attr {
14 struct bin_attribute * bin_attr; 15 struct bin_attribute *bin_attr;
15}; 16};
16 17
17/* 18/*
19 * sysfs_dirent - the building block of sysfs hierarchy. Each and
20 * every sysfs node is represented by single sysfs_dirent.
21 *
18 * As long as s_count reference is held, the sysfs_dirent itself is 22 * As long as s_count reference is held, the sysfs_dirent itself is
19 * accessible. Dereferencing s_elem or any other outer entity 23 * accessible. Dereferencing s_elem or any other outer entity
20 * requires s_active reference. 24 * requires s_active reference.
@@ -22,10 +26,10 @@ struct sysfs_elem_bin_attr {
22struct sysfs_dirent { 26struct sysfs_dirent {
23 atomic_t s_count; 27 atomic_t s_count;
24 atomic_t s_active; 28 atomic_t s_active;
25 struct sysfs_dirent * s_parent; 29 struct sysfs_dirent *s_parent;
26 struct sysfs_dirent * s_sibling; 30 struct sysfs_dirent *s_sibling;
27 struct sysfs_dirent * s_children; 31 struct sysfs_dirent *s_children;
28 const char * s_name; 32 const char *s_name;
29 33
30 union { 34 union {
31 struct sysfs_elem_dir dir; 35 struct sysfs_elem_dir dir;
@@ -37,12 +41,31 @@ struct sysfs_dirent {
37 unsigned int s_flags; 41 unsigned int s_flags;
38 umode_t s_mode; 42 umode_t s_mode;
39 ino_t s_ino; 43 ino_t s_ino;
40 struct iattr * s_iattr; 44 struct iattr *s_iattr;
41 atomic_t s_event; 45 atomic_t s_event;
42}; 46};
43 47
44#define SD_DEACTIVATED_BIAS INT_MIN 48#define SD_DEACTIVATED_BIAS INT_MIN
45 49
50#define SYSFS_TYPE_MASK 0x00ff
51#define SYSFS_ROOT 0x0001
52#define SYSFS_DIR 0x0002
53#define SYSFS_KOBJ_ATTR 0x0004
54#define SYSFS_KOBJ_BIN_ATTR 0x0008
55#define SYSFS_KOBJ_LINK 0x0020
56#define SYSFS_COPY_NAME (SYSFS_DIR | SYSFS_KOBJ_LINK)
57
58#define SYSFS_FLAG_MASK ~SYSFS_TYPE_MASK
59#define SYSFS_FLAG_REMOVED 0x0200
60
61static inline unsigned int sysfs_type(struct sysfs_dirent *sd)
62{
63 return sd->s_flags & SYSFS_TYPE_MASK;
64}
65
66/*
67 * Context structure to be used while adding/removing nodes.
68 */
46struct sysfs_addrm_cxt { 69struct sysfs_addrm_cxt {
47 struct sysfs_dirent *parent_sd; 70 struct sysfs_dirent *parent_sd;
48 struct inode *parent_inode; 71 struct inode *parent_inode;
@@ -50,59 +73,47 @@ struct sysfs_addrm_cxt {
50 int cnt; 73 int cnt;
51}; 74};
52 75
76/*
77 * mount.c
78 */
53extern struct sysfs_dirent sysfs_root; 79extern struct sysfs_dirent sysfs_root;
80extern struct super_block *sysfs_sb;
54extern struct kmem_cache *sysfs_dir_cachep; 81extern struct kmem_cache *sysfs_dir_cachep;
55 82
56extern struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd); 83/*
57extern struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd); 84 * dir.c
58extern void sysfs_put_active(struct sysfs_dirent *sd); 85 */
59extern struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd);
60extern void sysfs_put_active_two(struct sysfs_dirent *sd);
61extern void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt,
62 struct sysfs_dirent *parent_sd);
63extern int sysfs_add_one(struct sysfs_addrm_cxt *acxt,
64 struct sysfs_dirent *sd);
65extern void sysfs_remove_one(struct sysfs_addrm_cxt *acxt,
66 struct sysfs_dirent *sd);
67extern void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);
68
69extern struct inode * sysfs_get_inode(struct sysfs_dirent *sd);
70
71extern void release_sysfs_dirent(struct sysfs_dirent * sd);
72extern struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
73 const unsigned char *name);
74extern struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd,
75 const unsigned char *name);
76extern struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode,
77 int type);
78
79extern int sysfs_add_file(struct sysfs_dirent *dir_sd,
80 const struct attribute *attr, int type);
81extern int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name);
82extern struct sysfs_dirent *sysfs_find(struct sysfs_dirent *dir, const char * name);
83
84extern int sysfs_create_subdir(struct kobject *kobj, const char *name,
85 struct sysfs_dirent **p_sd);
86extern void sysfs_remove_subdir(struct sysfs_dirent *sd);
87
88extern int sysfs_setattr(struct dentry *dentry, struct iattr *iattr);
89
90extern spinlock_t sysfs_assoc_lock;
91extern struct mutex sysfs_mutex; 86extern struct mutex sysfs_mutex;
92extern struct mutex sysfs_rename_mutex; 87extern struct mutex sysfs_rename_mutex;
93extern struct super_block * sysfs_sb; 88extern spinlock_t sysfs_assoc_lock;
89
94extern const struct file_operations sysfs_dir_operations; 90extern const struct file_operations sysfs_dir_operations;
95extern const struct file_operations sysfs_file_operations;
96extern const struct file_operations bin_fops;
97extern const struct inode_operations sysfs_dir_inode_operations; 91extern const struct inode_operations sysfs_dir_inode_operations;
98extern const struct inode_operations sysfs_symlink_inode_operations;
99 92
100static inline unsigned int sysfs_type(struct sysfs_dirent *sd) 93struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd);
101{ 94struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd);
102 return sd->s_flags & SYSFS_TYPE_MASK; 95void sysfs_put_active(struct sysfs_dirent *sd);
103} 96struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd);
104 97void sysfs_put_active_two(struct sysfs_dirent *sd);
105static inline struct sysfs_dirent * sysfs_get(struct sysfs_dirent * sd) 98void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt,
99 struct sysfs_dirent *parent_sd);
100int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd);
101void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd);
102void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt);
103
104struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
105 const unsigned char *name);
106struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd,
107 const unsigned char *name);
108struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type);
109
110void release_sysfs_dirent(struct sysfs_dirent *sd);
111
112int sysfs_create_subdir(struct kobject *kobj, const char *name,
113 struct sysfs_dirent **p_sd);
114void sysfs_remove_subdir(struct sysfs_dirent *sd);
115
116static inline struct sysfs_dirent *sysfs_get(struct sysfs_dirent *sd)
106{ 117{
107 if (sd) { 118 if (sd) {
108 WARN_ON(!atomic_read(&sd->s_count)); 119 WARN_ON(!atomic_read(&sd->s_count));
@@ -111,8 +122,33 @@ static inline struct sysfs_dirent * sysfs_get(struct sysfs_dirent * sd)
111 return sd; 122 return sd;
112} 123}
113 124
114static inline void sysfs_put(struct sysfs_dirent * sd) 125static inline void sysfs_put(struct sysfs_dirent *sd)
115{ 126{
116 if (sd && atomic_dec_and_test(&sd->s_count)) 127 if (sd && atomic_dec_and_test(&sd->s_count))
117 release_sysfs_dirent(sd); 128 release_sysfs_dirent(sd);
118} 129}
130
131/*
132 * inode.c
133 */
134struct inode *sysfs_get_inode(struct sysfs_dirent *sd);
135int sysfs_setattr(struct dentry *dentry, struct iattr *iattr);
136int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name);
137
138/*
139 * file.c
140 */
141extern const struct file_operations sysfs_file_operations;
142
143int sysfs_add_file(struct sysfs_dirent *dir_sd,
144 const struct attribute *attr, int type);
145
146/*
147 * bin.c
148 */
149extern const struct file_operations bin_fops;
150
151/*
152 * symlink.c
153 */
154extern const struct inode_operations sysfs_symlink_inode_operations;