diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 04:30:04 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:13 -0500 |
commit | 52ef0c042bf06f6aef382fade175075627beebc1 (patch) | |
tree | a1256aebfd835da4cb29a80f391112fea82bf38e /security | |
parent | 910f4ecef3f67714ebff69d0bc34313e48afaed2 (diff) |
switch securityfs_create_file() to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r-- | security/apparmor/apparmorfs.c | 2 | ||||
-rw-r--r-- | security/inode.c | 12 | ||||
-rw-r--r-- | security/tomoyo/securityfs_if.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 69ddb47787b2..e39df6d43779 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c | |||
@@ -165,7 +165,7 @@ static void __init aafs_remove(const char *name) | |||
165 | * | 165 | * |
166 | * Used aafs_remove to remove entries created with this fn. | 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 | const struct file_operations *fops) | 169 | const struct file_operations *fops) |
170 | { | 170 | { |
171 | struct dentry *dentry; | 171 | struct dentry *dentry; |
diff --git a/security/inode.c b/security/inode.c index bfe02e68f92e..90a70a67d835 100644 --- a/security/inode.c +++ b/security/inode.c | |||
@@ -56,7 +56,7 @@ static const struct file_operations default_file_ops = { | |||
56 | .llseek = noop_llseek, | 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 | struct inode *inode = new_inode(sb); | 61 | struct inode *inode = new_inode(sb); |
62 | 62 | ||
@@ -85,7 +85,7 @@ static struct inode *get_inode(struct super_block *sb, int mode, dev_t dev) | |||
85 | 85 | ||
86 | /* SMP-safe */ | 86 | /* SMP-safe */ |
87 | static int mknod(struct inode *dir, struct dentry *dentry, | 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 | struct inode *inode; | 90 | struct inode *inode; |
91 | int error = -ENOMEM; | 91 | int error = -ENOMEM; |
@@ -102,7 +102,7 @@ static int mknod(struct inode *dir, struct dentry *dentry, | |||
102 | return error; | 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 | int res; | 107 | int res; |
108 | 108 | ||
@@ -113,7 +113,7 @@ static int mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
113 | return res; | 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 | mode = (mode & S_IALLUGO) | S_IFREG; | 118 | mode = (mode & S_IALLUGO) | S_IFREG; |
119 | return mknod(dir, dentry, mode, 0); | 119 | return mknod(dir, dentry, mode, 0); |
@@ -145,7 +145,7 @@ static struct file_system_type fs_type = { | |||
145 | .kill_sb = kill_litter_super, | 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 | struct dentry *parent, | 149 | struct dentry *parent, |
150 | struct dentry **dentry) | 150 | struct dentry **dentry) |
151 | { | 151 | { |
@@ -205,7 +205,7 @@ static int create_by_name(const char *name, mode_t mode, | |||
205 | * If securityfs is not enabled in the kernel, the value %-ENODEV is | 205 | * If securityfs is not enabled in the kernel, the value %-ENODEV is |
206 | * returned. | 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 | struct dentry *parent, void *data, | 209 | struct dentry *parent, void *data, |
210 | const struct file_operations *fops) | 210 | const struct file_operations *fops) |
211 | { | 211 | { |
diff --git a/security/tomoyo/securityfs_if.c b/security/tomoyo/securityfs_if.c index 2672ac4f3beb..482b2a5f48f0 100644 --- a/security/tomoyo/securityfs_if.c +++ b/security/tomoyo/securityfs_if.c | |||
@@ -224,7 +224,7 @@ static const struct file_operations tomoyo_operations = { | |||
224 | * | 224 | * |
225 | * Returns nothing. | 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 | struct dentry *parent, const u8 key) | 228 | struct dentry *parent, const u8 key) |
229 | { | 229 | { |
230 | securityfs_create_file(name, mode, parent, ((u8 *) NULL) + key, | 230 | securityfs_create_file(name, mode, parent, ((u8 *) NULL) + key, |