diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-24 03:36:29 -0400 | 
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:54:56 -0500 | 
| commit | d161a13f974c72fd7ff0069d39a3ae57cb5694ff (patch) | |
| tree | 0c6d6237b3eafbe362798d7727a02f509fd72ca9 /include | |
| parent | 587a1f1659e8b330b8738ef4901832a2b63f0bed (diff) | |
| download | olio-linux-3.10-d161a13f974c72fd7ff0069d39a3ae57cb5694ff.tar.xz olio-linux-3.10-d161a13f974c72fd7ff0069d39a3ae57cb5694ff.zip  | |
switch procfs to umode_t use
both proc_dir_entry ->mode and populating functions
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 2 | ||||
| -rw-r--r-- | include/linux/proc_fs.h | 24 | ||||
| -rw-r--r-- | include/sound/info.h | 2 | 
3 files changed, 14 insertions, 14 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 42557851b12..501370b61ee 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -920,7 +920,7 @@ __IDE_PROC_DEVSET(_name, _min, _max, NULL, NULL)  typedef struct {  	const char	*name; -	mode_t		mode; +	umode_t		mode;  	const struct file_operations *proc_fops;  } ide_proc_entry_t; diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 643b96c7a94..6d9e575519c 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -50,7 +50,7 @@ typedef	int (write_proc_t)(struct file *file, const char __user *buffer,  struct proc_dir_entry {  	unsigned int low_ino; -	mode_t mode; +	umode_t mode;  	nlink_t nlink;  	uid_t uid;  	gid_t gid; @@ -106,9 +106,9 @@ extern void proc_root_init(void);  void proc_flush_task(struct task_struct *task); -extern struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode, +extern struct proc_dir_entry *create_proc_entry(const char *name, umode_t mode,  						struct proc_dir_entry *parent); -struct proc_dir_entry *proc_create_data(const char *name, mode_t mode, +struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,  				struct proc_dir_entry *parent,  				const struct file_operations *proc_fops,  				void *data); @@ -146,17 +146,17 @@ extern void proc_device_tree_update_prop(struct proc_dir_entry *pde,  extern struct proc_dir_entry *proc_symlink(const char *,  		struct proc_dir_entry *, const char *);  extern struct proc_dir_entry *proc_mkdir(const char *,struct proc_dir_entry *); -extern struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode, +extern struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,  			struct proc_dir_entry *parent); -static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode, +static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode,  	struct proc_dir_entry *parent, const struct file_operations *proc_fops)  {  	return proc_create_data(name, mode, parent, proc_fops, NULL);  }  static inline struct proc_dir_entry *create_proc_read_entry(const char *name, -	mode_t mode, struct proc_dir_entry *base,  +	umode_t mode, struct proc_dir_entry *base,   	read_proc_t *read_proc, void * data)  {  	struct proc_dir_entry *res=create_proc_entry(name,mode,base); @@ -168,7 +168,7 @@ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,  }  extern struct proc_dir_entry *proc_net_fops_create(struct net *net, -	const char *name, mode_t mode, const struct file_operations *fops); +	const char *name, umode_t mode, const struct file_operations *fops);  extern void proc_net_remove(struct net *net, const char *name);  extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,  	struct proc_dir_entry *parent); @@ -185,15 +185,15 @@ static inline void proc_flush_task(struct task_struct *task)  }  static inline struct proc_dir_entry *create_proc_entry(const char *name, -	mode_t mode, struct proc_dir_entry *parent) { return NULL; } +	umode_t mode, struct proc_dir_entry *parent) { return NULL; }  static inline struct proc_dir_entry *proc_create(const char *name, -	mode_t mode, struct proc_dir_entry *parent, +	umode_t mode, struct proc_dir_entry *parent,  	const struct file_operations *proc_fops)  {  	return NULL;  }  static inline struct proc_dir_entry *proc_create_data(const char *name, -	mode_t mode, struct proc_dir_entry *parent, +	umode_t mode, struct proc_dir_entry *parent,  	const struct file_operations *proc_fops, void *data)  {  	return NULL; @@ -205,10 +205,10 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,  static inline struct proc_dir_entry *proc_mkdir(const char *name,  	struct proc_dir_entry *parent) {return NULL;}  static inline struct proc_dir_entry *proc_mkdir_mode(const char *name, -	mode_t mode, struct proc_dir_entry *parent) { return NULL; } +	umode_t mode, struct proc_dir_entry *parent) { return NULL; }  static inline struct proc_dir_entry *create_proc_read_entry(const char *name, -	mode_t mode, struct proc_dir_entry *base,  +	umode_t mode, struct proc_dir_entry *base,   	read_proc_t *read_proc, void * data) { return NULL; }  struct tty_driver; diff --git a/include/sound/info.h b/include/sound/info.h index 5492cc40dc5..9ca1a493d37 100644 --- a/include/sound/info.h +++ b/include/sound/info.h @@ -72,7 +72,7 @@ struct snd_info_entry_ops {  struct snd_info_entry {  	const char *name; -	mode_t mode; +	umode_t mode;  	long size;  	unsigned short content;  	union {  |