Commit 52ef0c042bf06f6aef382fade175075627beebc1
1 parent
910f4ecef3
Exists in
master
and in
20 other branches
switch securityfs_create_file() to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 4 changed files with 10 additions and 10 deletions Side-by-side Diff
include/linux/security.h
... | ... | @@ -3010,7 +3010,7 @@ |
3010 | 3010 | |
3011 | 3011 | #ifdef CONFIG_SECURITYFS |
3012 | 3012 | |
3013 | -extern struct dentry *securityfs_create_file(const char *name, mode_t mode, | |
3013 | +extern struct dentry *securityfs_create_file(const char *name, umode_t mode, | |
3014 | 3014 | struct dentry *parent, void *data, |
3015 | 3015 | const struct file_operations *fops); |
3016 | 3016 | extern struct dentry *securityfs_create_dir(const char *name, struct dentry *parent); |
... | ... | @@ -3025,7 +3025,7 @@ |
3025 | 3025 | } |
3026 | 3026 | |
3027 | 3027 | static inline struct dentry *securityfs_create_file(const char *name, |
3028 | - mode_t mode, | |
3028 | + umode_t mode, | |
3029 | 3029 | struct dentry *parent, |
3030 | 3030 | void *data, |
3031 | 3031 | const struct file_operations *fops) |
security/apparmor/apparmorfs.c
... | ... | @@ -165,7 +165,7 @@ |
165 | 165 | * |
166 | 166 | * Used aafs_remove to remove entries created with this fn. |
167 | 167 | */ |
168 | -static int __init aafs_create(const char *name, int mask, | |
168 | +static int __init aafs_create(const char *name, umode_t mask, | |
169 | 169 | const struct file_operations *fops) |
170 | 170 | { |
171 | 171 | struct dentry *dentry; |
security/inode.c
... | ... | @@ -56,7 +56,7 @@ |
56 | 56 | .llseek = noop_llseek, |
57 | 57 | }; |
58 | 58 | |
59 | -static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev) | |
59 | +static struct inode *get_inode(struct super_block *sb, umode_t mode, dev_t dev) | |
60 | 60 | { |
61 | 61 | struct inode *inode = new_inode(sb); |
62 | 62 | |
... | ... | @@ -85,7 +85,7 @@ |
85 | 85 | |
86 | 86 | /* SMP-safe */ |
87 | 87 | static int mknod(struct inode *dir, struct dentry *dentry, |
88 | - int mode, dev_t dev) | |
88 | + umode_t mode, dev_t dev) | |
89 | 89 | { |
90 | 90 | struct inode *inode; |
91 | 91 | int error = -ENOMEM; |
... | ... | @@ -102,7 +102,7 @@ |
102 | 102 | return error; |
103 | 103 | } |
104 | 104 | |
105 | -static int mkdir(struct inode *dir, struct dentry *dentry, int mode) | |
105 | +static int mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) | |
106 | 106 | { |
107 | 107 | int res; |
108 | 108 | |
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 | return res; |
114 | 114 | } |
115 | 115 | |
116 | -static int create(struct inode *dir, struct dentry *dentry, int mode) | |
116 | +static int create(struct inode *dir, struct dentry *dentry, umode_t mode) | |
117 | 117 | { |
118 | 118 | mode = (mode & S_IALLUGO) | S_IFREG; |
119 | 119 | return mknod(dir, dentry, mode, 0); |
... | ... | @@ -145,7 +145,7 @@ |
145 | 145 | .kill_sb = kill_litter_super, |
146 | 146 | }; |
147 | 147 | |
148 | -static int create_by_name(const char *name, mode_t mode, | |
148 | +static int create_by_name(const char *name, umode_t mode, | |
149 | 149 | struct dentry *parent, |
150 | 150 | struct dentry **dentry) |
151 | 151 | { |
... | ... | @@ -205,7 +205,7 @@ |
205 | 205 | * If securityfs is not enabled in the kernel, the value %-ENODEV is |
206 | 206 | * returned. |
207 | 207 | */ |
208 | -struct dentry *securityfs_create_file(const char *name, mode_t mode, | |
208 | +struct dentry *securityfs_create_file(const char *name, umode_t mode, | |
209 | 209 | struct dentry *parent, void *data, |
210 | 210 | const struct file_operations *fops) |
211 | 211 | { |
security/tomoyo/securityfs_if.c
... | ... | @@ -224,7 +224,7 @@ |
224 | 224 | * |
225 | 225 | * Returns nothing. |
226 | 226 | */ |
227 | -static void __init tomoyo_create_entry(const char *name, const mode_t mode, | |
227 | +static void __init tomoyo_create_entry(const char *name, const umode_t mode, | |
228 | 228 | struct dentry *parent, const u8 key) |
229 | 229 | { |
230 | 230 | securityfs_create_file(name, mode, parent, ((u8 *) NULL) + key, |