diff options
| author | Tejun Heo <htejun@gmail.com> | 2007-09-20 16:05:10 +0900 | 
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 14:51:09 -0700 | 
| commit | 59f69015684b3de7b9472be9a81b1a978f93a496 (patch) | |
| tree | 3d3f7880e9f0d9c867695b120944540e815f194a /fs/sysfs/sysfs.h | |
| parent | f88123eaf953f13a0c597dde54745d28f81236de (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.h | 146 | 
1 files changed, 91 insertions, 55 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 @@ +/* type-specific structures for sysfs_dirent->s_* union members */  struct sysfs_elem_dir { -	struct kobject		* kobj; +	struct kobject		*kobj;  };  struct sysfs_elem_symlink { -	struct sysfs_dirent	* target_sd; +	struct sysfs_dirent	*target_sd;  };  struct sysfs_elem_attr { -	struct attribute	* attr; +	struct attribute	*attr;  };  struct sysfs_elem_bin_attr { -	struct bin_attribute	* bin_attr; +	struct bin_attribute	*bin_attr;  };  /* + * sysfs_dirent - the building block of sysfs hierarchy.  Each and + * every sysfs node is represented by single sysfs_dirent. + *   * As long as s_count reference is held, the sysfs_dirent itself is   * accessible.  Dereferencing s_elem or any other outer entity   * requires s_active reference. @@ -22,10 +26,10 @@ struct sysfs_elem_bin_attr {  struct sysfs_dirent {  	atomic_t		s_count;  	atomic_t		s_active; -	struct sysfs_dirent	* s_parent; -	struct sysfs_dirent	* s_sibling; -	struct sysfs_dirent	* s_children; -	const char		* s_name; +	struct sysfs_dirent	*s_parent; +	struct sysfs_dirent	*s_sibling; +	struct sysfs_dirent	*s_children; +	const char		*s_name;  	union {  		struct sysfs_elem_dir		dir; @@ -37,12 +41,31 @@ struct sysfs_dirent {  	unsigned int		s_flags;  	umode_t			s_mode;  	ino_t			s_ino; -	struct iattr		* s_iattr; +	struct iattr		*s_iattr;  	atomic_t		s_event;  }; -#define SD_DEACTIVATED_BIAS	INT_MIN +#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_COPY_NAME			(SYSFS_DIR | SYSFS_KOBJ_LINK) + +#define SYSFS_FLAG_MASK			~SYSFS_TYPE_MASK +#define SYSFS_FLAG_REMOVED		0x0200 + +static inline unsigned int sysfs_type(struct sysfs_dirent *sd) +{ +	return sd->s_flags & SYSFS_TYPE_MASK; +} + +/* + * Context structure to be used while adding/removing nodes. + */  struct sysfs_addrm_cxt {  	struct sysfs_dirent	*parent_sd;  	struct inode		*parent_inode; @@ -50,59 +73,47 @@ struct sysfs_addrm_cxt {  	int			cnt;  }; +/* + * mount.c + */  extern struct sysfs_dirent sysfs_root; +extern struct super_block *sysfs_sb;  extern struct kmem_cache *sysfs_dir_cachep; -extern struct dentry *sysfs_get_dentry(struct sysfs_dirent *sd); -extern struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd); -extern void sysfs_put_active(struct sysfs_dirent *sd); -extern struct sysfs_dirent *sysfs_get_active_two(struct sysfs_dirent *sd); -extern void sysfs_put_active_two(struct sysfs_dirent *sd); -extern void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt, -			      struct sysfs_dirent *parent_sd); -extern int sysfs_add_one(struct sysfs_addrm_cxt *acxt, -			  struct sysfs_dirent *sd); -extern void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, -			     struct sysfs_dirent *sd); -extern void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt); - -extern struct inode * sysfs_get_inode(struct sysfs_dirent *sd); - -extern void release_sysfs_dirent(struct sysfs_dirent * sd); -extern struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd, -					      const unsigned char *name); -extern struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd, -					     const unsigned char *name); -extern struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, -					     int type); - -extern int sysfs_add_file(struct sysfs_dirent *dir_sd, -			  const struct attribute *attr, int type); -extern int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name); -extern struct sysfs_dirent *sysfs_find(struct sysfs_dirent *dir, const char * name); - -extern int sysfs_create_subdir(struct kobject *kobj, const char *name, -			       struct sysfs_dirent **p_sd); -extern void sysfs_remove_subdir(struct sysfs_dirent *sd); - -extern int sysfs_setattr(struct dentry *dentry, struct iattr *iattr); - -extern spinlock_t sysfs_assoc_lock; +/* + * dir.c + */  extern struct mutex sysfs_mutex;  extern struct mutex sysfs_rename_mutex; -extern struct super_block * sysfs_sb; +extern spinlock_t sysfs_assoc_lock; +  extern const struct file_operations sysfs_dir_operations; -extern const struct file_operations sysfs_file_operations; -extern const struct file_operations bin_fops;  extern const struct inode_operations sysfs_dir_inode_operations; -extern const struct inode_operations sysfs_symlink_inode_operations; -static inline unsigned int sysfs_type(struct sysfs_dirent *sd) -{ -	return sd->s_flags & SYSFS_TYPE_MASK; -} +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, +		       struct sysfs_dirent *parent_sd); +int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd); +void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd); +void sysfs_addrm_finish(struct sysfs_addrm_cxt *acxt); + +struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd, +				       const unsigned char *name); +struct sysfs_dirent *sysfs_get_dirent(struct sysfs_dirent *parent_sd, +				      const unsigned char *name); +struct sysfs_dirent *sysfs_new_dirent(const char *name, umode_t mode, int type); -static inline struct sysfs_dirent * sysfs_get(struct sysfs_dirent * sd) +void release_sysfs_dirent(struct sysfs_dirent *sd); + +int sysfs_create_subdir(struct kobject *kobj, const char *name, +			struct sysfs_dirent **p_sd); +void sysfs_remove_subdir(struct sysfs_dirent *sd); + +static inline struct sysfs_dirent *sysfs_get(struct sysfs_dirent *sd)  {  	if (sd) {  		WARN_ON(!atomic_read(&sd->s_count)); @@ -111,8 +122,33 @@ static inline struct sysfs_dirent * sysfs_get(struct sysfs_dirent * sd)  	return sd;  } -static inline void sysfs_put(struct sysfs_dirent * sd) +static inline void sysfs_put(struct sysfs_dirent *sd)  {  	if (sd && atomic_dec_and_test(&sd->s_count))  		release_sysfs_dirent(sd);  } + +/* + * inode.c + */ +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); + +/* + * file.c + */ +extern const struct file_operations sysfs_file_operations; + +int sysfs_add_file(struct sysfs_dirent *dir_sd, +		   const struct attribute *attr, int type); + +/* + * bin.c + */ +extern const struct file_operations bin_fops; + +/* + * symlink.c + */ +extern const struct inode_operations sysfs_symlink_inode_operations; | 
