diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 15:19:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 15:19:57 -0500 |
commit | 972b2c719990f91eb3b2310d44ef8a2d38955a14 (patch) | |
tree | b25a250ec5bec4b7b6355d214642d8b57c5cab32 /include/linux/debugfs.h | |
parent | 02550d61f49266930e674286379d3601006b2893 (diff) | |
parent | c3aa077648e147783a7a53b409578234647db853 (diff) |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)
reiserfs: Properly display mount options in /proc/mounts
vfs: prevent remount read-only if pending removes
vfs: count unlinked inodes
vfs: protect remounting superblock read-only
vfs: keep list of mounts for each superblock
vfs: switch ->show_options() to struct dentry *
vfs: switch ->show_path() to struct dentry *
vfs: switch ->show_devname() to struct dentry *
vfs: switch ->show_stats to struct dentry *
switch security_path_chmod() to struct path *
vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb
vfs: trim includes a bit
switch mnt_namespace ->root to struct mount
vfs: take /proc/*/mounts and friends to fs/proc_namespace.c
vfs: opencode mntget() mnt_set_mountpoint()
vfs: spread struct mount - remaining argument of next_mnt()
vfs: move fsnotify junk to struct mount
vfs: move mnt_devname
vfs: move mnt_list to struct mount
vfs: switch pnode.h macros to struct mount *
...
Diffstat (limited to 'include/linux/debugfs.h')
-rw-r--r-- | include/linux/debugfs.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index e8c3abc60811..6169c26fd8c8 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h | |||
@@ -46,7 +46,7 @@ extern struct dentry *arch_debugfs_dir; | |||
46 | extern const struct file_operations debugfs_file_operations; | 46 | extern const struct file_operations debugfs_file_operations; |
47 | extern const struct inode_operations debugfs_link_operations; | 47 | extern const struct inode_operations debugfs_link_operations; |
48 | 48 | ||
49 | struct dentry *debugfs_create_file(const char *name, mode_t mode, | 49 | struct dentry *debugfs_create_file(const char *name, umode_t mode, |
50 | struct dentry *parent, void *data, | 50 | struct dentry *parent, void *data, |
51 | const struct file_operations *fops); | 51 | const struct file_operations *fops); |
52 | 52 | ||
@@ -61,28 +61,28 @@ void debugfs_remove_recursive(struct dentry *dentry); | |||
61 | struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, | 61 | struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, |
62 | struct dentry *new_dir, const char *new_name); | 62 | struct dentry *new_dir, const char *new_name); |
63 | 63 | ||
64 | struct dentry *debugfs_create_u8(const char *name, mode_t mode, | 64 | struct dentry *debugfs_create_u8(const char *name, umode_t mode, |
65 | struct dentry *parent, u8 *value); | 65 | struct dentry *parent, u8 *value); |
66 | struct dentry *debugfs_create_u16(const char *name, mode_t mode, | 66 | struct dentry *debugfs_create_u16(const char *name, umode_t mode, |
67 | struct dentry *parent, u16 *value); | 67 | struct dentry *parent, u16 *value); |
68 | struct dentry *debugfs_create_u32(const char *name, mode_t mode, | 68 | struct dentry *debugfs_create_u32(const char *name, umode_t mode, |
69 | struct dentry *parent, u32 *value); | 69 | struct dentry *parent, u32 *value); |
70 | struct dentry *debugfs_create_u64(const char *name, mode_t mode, | 70 | struct dentry *debugfs_create_u64(const char *name, umode_t mode, |
71 | struct dentry *parent, u64 *value); | 71 | struct dentry *parent, u64 *value); |
72 | struct dentry *debugfs_create_x8(const char *name, mode_t mode, | 72 | struct dentry *debugfs_create_x8(const char *name, umode_t mode, |
73 | struct dentry *parent, u8 *value); | 73 | struct dentry *parent, u8 *value); |
74 | struct dentry *debugfs_create_x16(const char *name, mode_t mode, | 74 | struct dentry *debugfs_create_x16(const char *name, umode_t mode, |
75 | struct dentry *parent, u16 *value); | 75 | struct dentry *parent, u16 *value); |
76 | struct dentry *debugfs_create_x32(const char *name, mode_t mode, | 76 | struct dentry *debugfs_create_x32(const char *name, umode_t mode, |
77 | struct dentry *parent, u32 *value); | 77 | struct dentry *parent, u32 *value); |
78 | struct dentry *debugfs_create_x64(const char *name, mode_t mode, | 78 | struct dentry *debugfs_create_x64(const char *name, umode_t mode, |
79 | struct dentry *parent, u64 *value); | 79 | struct dentry *parent, u64 *value); |
80 | struct dentry *debugfs_create_size_t(const char *name, mode_t mode, | 80 | struct dentry *debugfs_create_size_t(const char *name, umode_t mode, |
81 | struct dentry *parent, size_t *value); | 81 | struct dentry *parent, size_t *value); |
82 | struct dentry *debugfs_create_bool(const char *name, mode_t mode, | 82 | struct dentry *debugfs_create_bool(const char *name, umode_t mode, |
83 | struct dentry *parent, u32 *value); | 83 | struct dentry *parent, u32 *value); |
84 | 84 | ||
85 | struct dentry *debugfs_create_blob(const char *name, mode_t mode, | 85 | struct dentry *debugfs_create_blob(const char *name, umode_t mode, |
86 | struct dentry *parent, | 86 | struct dentry *parent, |
87 | struct debugfs_blob_wrapper *blob); | 87 | struct debugfs_blob_wrapper *blob); |
88 | 88 | ||
@@ -105,7 +105,7 @@ bool debugfs_initialized(void); | |||
105 | * want to duplicate the design decision mistakes of procfs and devfs again. | 105 | * want to duplicate the design decision mistakes of procfs and devfs again. |
106 | */ | 106 | */ |
107 | 107 | ||
108 | static inline struct dentry *debugfs_create_file(const char *name, mode_t mode, | 108 | static inline struct dentry *debugfs_create_file(const char *name, umode_t mode, |
109 | struct dentry *parent, void *data, | 109 | struct dentry *parent, void *data, |
110 | const struct file_operations *fops) | 110 | const struct file_operations *fops) |
111 | { | 111 | { |
@@ -137,70 +137,70 @@ static inline struct dentry *debugfs_rename(struct dentry *old_dir, struct dentr | |||
137 | return ERR_PTR(-ENODEV); | 137 | return ERR_PTR(-ENODEV); |
138 | } | 138 | } |
139 | 139 | ||
140 | static inline struct dentry *debugfs_create_u8(const char *name, mode_t mode, | 140 | static inline struct dentry *debugfs_create_u8(const char *name, umode_t mode, |
141 | struct dentry *parent, | 141 | struct dentry *parent, |
142 | u8 *value) | 142 | u8 *value) |
143 | { | 143 | { |
144 | return ERR_PTR(-ENODEV); | 144 | return ERR_PTR(-ENODEV); |
145 | } | 145 | } |
146 | 146 | ||
147 | static inline struct dentry *debugfs_create_u16(const char *name, mode_t mode, | 147 | static inline struct dentry *debugfs_create_u16(const char *name, umode_t mode, |
148 | struct dentry *parent, | 148 | struct dentry *parent, |
149 | u16 *value) | 149 | u16 *value) |
150 | { | 150 | { |
151 | return ERR_PTR(-ENODEV); | 151 | return ERR_PTR(-ENODEV); |
152 | } | 152 | } |
153 | 153 | ||
154 | static inline struct dentry *debugfs_create_u32(const char *name, mode_t mode, | 154 | static inline struct dentry *debugfs_create_u32(const char *name, umode_t mode, |
155 | struct dentry *parent, | 155 | struct dentry *parent, |
156 | u32 *value) | 156 | u32 *value) |
157 | { | 157 | { |
158 | return ERR_PTR(-ENODEV); | 158 | return ERR_PTR(-ENODEV); |
159 | } | 159 | } |
160 | 160 | ||
161 | static inline struct dentry *debugfs_create_u64(const char *name, mode_t mode, | 161 | static inline struct dentry *debugfs_create_u64(const char *name, umode_t mode, |
162 | struct dentry *parent, | 162 | struct dentry *parent, |
163 | u64 *value) | 163 | u64 *value) |
164 | { | 164 | { |
165 | return ERR_PTR(-ENODEV); | 165 | return ERR_PTR(-ENODEV); |
166 | } | 166 | } |
167 | 167 | ||
168 | static inline struct dentry *debugfs_create_x8(const char *name, mode_t mode, | 168 | static inline struct dentry *debugfs_create_x8(const char *name, umode_t mode, |
169 | struct dentry *parent, | 169 | struct dentry *parent, |
170 | u8 *value) | 170 | u8 *value) |
171 | { | 171 | { |
172 | return ERR_PTR(-ENODEV); | 172 | return ERR_PTR(-ENODEV); |
173 | } | 173 | } |
174 | 174 | ||
175 | static inline struct dentry *debugfs_create_x16(const char *name, mode_t mode, | 175 | static inline struct dentry *debugfs_create_x16(const char *name, umode_t mode, |
176 | struct dentry *parent, | 176 | struct dentry *parent, |
177 | u16 *value) | 177 | u16 *value) |
178 | { | 178 | { |
179 | return ERR_PTR(-ENODEV); | 179 | return ERR_PTR(-ENODEV); |
180 | } | 180 | } |
181 | 181 | ||
182 | static inline struct dentry *debugfs_create_x32(const char *name, mode_t mode, | 182 | static inline struct dentry *debugfs_create_x32(const char *name, umode_t mode, |
183 | struct dentry *parent, | 183 | struct dentry *parent, |
184 | u32 *value) | 184 | u32 *value) |
185 | { | 185 | { |
186 | return ERR_PTR(-ENODEV); | 186 | return ERR_PTR(-ENODEV); |
187 | } | 187 | } |
188 | 188 | ||
189 | static inline struct dentry *debugfs_create_size_t(const char *name, mode_t mode, | 189 | static inline struct dentry *debugfs_create_size_t(const char *name, umode_t mode, |
190 | struct dentry *parent, | 190 | struct dentry *parent, |
191 | size_t *value) | 191 | size_t *value) |
192 | { | 192 | { |
193 | return ERR_PTR(-ENODEV); | 193 | return ERR_PTR(-ENODEV); |
194 | } | 194 | } |
195 | 195 | ||
196 | static inline struct dentry *debugfs_create_bool(const char *name, mode_t mode, | 196 | static inline struct dentry *debugfs_create_bool(const char *name, umode_t mode, |
197 | struct dentry *parent, | 197 | struct dentry *parent, |
198 | u32 *value) | 198 | u32 *value) |
199 | { | 199 | { |
200 | return ERR_PTR(-ENODEV); | 200 | return ERR_PTR(-ENODEV); |
201 | } | 201 | } |
202 | 202 | ||
203 | static inline struct dentry *debugfs_create_blob(const char *name, mode_t mode, | 203 | static inline struct dentry *debugfs_create_blob(const char *name, umode_t mode, |
204 | struct dentry *parent, | 204 | struct dentry *parent, |
205 | struct debugfs_blob_wrapper *blob) | 205 | struct debugfs_blob_wrapper *blob) |
206 | { | 206 | { |