Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7e40145eb111a5192e6d819f764db9d6828d1abb

Authored by Al Viro
1 parent 9c2c703929
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

->permission() sanitizing: don't pass flags to ->check_acl() 

not used in the instances anymore.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 28 changed files with 32 additions and 32 deletions Side-by-side Diff

Documentation/filesystems/Locking
Diff comments   View file @ 7e40145
... ... @@ -52,7 +52,7 @@
52 52 void (*put_link) (struct dentry *, struct nameidata *, void *);
53 53 void (*truncate) (struct inode *);
54 54 int (*permission) (struct inode *, int, unsigned int);
55   - int (*check_acl)(struct inode *, int, unsigned int);
  55 + int (*check_acl)(struct inode *, int);
56 56 int (*setattr) (struct dentry *, struct iattr *);
57 57 int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);
58 58 int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
Documentation/filesystems/vfs.txt
Diff comments   View file @ 7e40145
... ... @@ -334,7 +334,7 @@
334 334 void (*put_link) (struct dentry *, struct nameidata *, void *);
335 335 void (*truncate) (struct inode *);
336 336 int (*permission) (struct inode *, int, unsigned int);
337   - int (*check_acl)(struct inode *, int, unsigned int);
  337 + int (*check_acl)(struct inode *, int);
338 338 int (*setattr) (struct dentry *, struct iattr *);
339 339 int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
340 340 int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
... ... @@ -96,7 +96,7 @@
96 96 return acl;
97 97 }
98 98  
99   -int v9fs_check_acl(struct inode *inode, int mask, unsigned int flags)
  99 +int v9fs_check_acl(struct inode *inode, int mask)
100 100 {
101 101 struct posix_acl *acl;
102 102 struct v9fs_session_info *v9ses;
... ... @@ -16,7 +16,7 @@
16 16  
17 17 #ifdef CONFIG_9P_FS_POSIX_ACL
18 18 extern int v9fs_get_acl(struct inode *, struct p9_fid *);
19   -extern int v9fs_check_acl(struct inode *inode, int mask, unsigned int flags);
  19 +extern int v9fs_check_acl(struct inode *inode, int mask);
20 20 extern int v9fs_acl_chmod(struct dentry *);
21 21 extern int v9fs_set_create_acl(struct dentry *,
22 22 struct posix_acl *, struct posix_acl *);
... ... @@ -195,7 +195,7 @@
195 195 return ret;
196 196 }
197 197  
198   -int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags)
  198 +int btrfs_check_acl(struct inode *inode, int mask)
199 199 {
200 200 int error = -EAGAIN;
201 201  
... ... @@ -2642,7 +2642,7 @@
2642 2642  
2643 2643 /* acl.c */
2644 2644 #ifdef CONFIG_BTRFS_FS_POSIX_ACL
2645   -int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags);
  2645 +int btrfs_check_acl(struct inode *inode, int mask);
2646 2646 #else
2647 2647 #define btrfs_check_acl NULL
2648 2648 #endif
... ... @@ -232,7 +232,7 @@
232 232 }
233 233  
234 234 int
235   -ext2_check_acl(struct inode *inode, int mask, unsigned int flags)
  235 +ext2_check_acl(struct inode *inode, int mask)
236 236 {
237 237 struct posix_acl *acl;
238 238  
... ... @@ -54,7 +54,7 @@
54 54 #ifdef CONFIG_EXT2_FS_POSIX_ACL
55 55  
56 56 /* acl.c */
57   -extern int ext2_check_acl (struct inode *, int, unsigned int);
  57 +extern int ext2_check_acl (struct inode *, int);
58 58 extern int ext2_acl_chmod (struct inode *);
59 59 extern int ext2_init_acl (struct inode *, struct inode *);
60 60  
... ... @@ -240,7 +240,7 @@
240 240 }
241 241  
242 242 int
243   -ext3_check_acl(struct inode *inode, int mask, unsigned int flags)
  243 +ext3_check_acl(struct inode *inode, int mask)
244 244 {
245 245 struct posix_acl *acl;
246 246  
... ... @@ -54,7 +54,7 @@
54 54 #ifdef CONFIG_EXT3_FS_POSIX_ACL
55 55  
56 56 /* acl.c */
57   -extern int ext3_check_acl (struct inode *, int, unsigned int);
  57 +extern int ext3_check_acl (struct inode *, int);
58 58 extern int ext3_acl_chmod (struct inode *);
59 59 extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);
60 60  
... ... @@ -238,7 +238,7 @@
238 238 }
239 239  
240 240 int
241   -ext4_check_acl(struct inode *inode, int mask, unsigned int flags)
  241 +ext4_check_acl(struct inode *inode, int mask)
242 242 {
243 243 struct posix_acl *acl;
244 244  
... ... @@ -54,7 +54,7 @@
54 54 #ifdef CONFIG_EXT4_FS_POSIX_ACL
55 55  
56 56 /* acl.c */
57   -extern int ext4_check_acl(struct inode *, int, unsigned int);
  57 +extern int ext4_check_acl(struct inode *, int);
58 58 extern int ext4_acl_chmod(struct inode *);
59 59 extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
60 60  
... ... @@ -190,7 +190,7 @@
190 190 }
191 191  
192 192 int
193   -generic_check_acl(struct inode *inode, int mask, unsigned int flags)
  193 +generic_check_acl(struct inode *inode, int mask)
194 194 {
195 195 if (mask & MAY_NOT_BLOCK) {
196 196 if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))
... ... @@ -75,7 +75,7 @@
75 75 * Returns: errno
76 76 */
77 77  
78   -int gfs2_check_acl(struct inode *inode, int mask, unsigned int flags)
  78 +int gfs2_check_acl(struct inode *inode, int mask)
79 79 {
80 80 struct posix_acl *acl;
81 81 int error;
... ... @@ -16,7 +16,7 @@
16 16 #define GFS2_POSIX_ACL_DEFAULT "posix_acl_default"
17 17 #define GFS2_ACL_MAX_ENTRIES 25
18 18  
19   -extern int gfs2_check_acl(struct inode *inode, int mask, unsigned int);
  19 +extern int gfs2_check_acl(struct inode *inode, int mask);
20 20 extern int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode);
21 21 extern int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr);
22 22 extern const struct xattr_handler gfs2_xattr_system_handler;
... ... @@ -259,7 +259,7 @@
259 259 return rc;
260 260 }
261 261  
262   -int jffs2_check_acl(struct inode *inode, int mask, unsigned int flags)
  262 +int jffs2_check_acl(struct inode *inode, int mask)
263 263 {
264 264 struct posix_acl *acl;
265 265 int rc;
... ... @@ -26,7 +26,7 @@
26 26  
27 27 #ifdef CONFIG_JFFS2_FS_POSIX_ACL
28 28  
29   -extern int jffs2_check_acl(struct inode *, int, unsigned int);
  29 +extern int jffs2_check_acl(struct inode *, int);
30 30 extern int jffs2_acl_chmod(struct inode *);
31 31 extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);
32 32 extern int jffs2_init_acl_post(struct inode *);
... ... @@ -114,7 +114,7 @@
114 114 return rc;
115 115 }
116 116  
117   -int jfs_check_acl(struct inode *inode, int mask, unsigned int flags)
  117 +int jfs_check_acl(struct inode *inode, int mask)
118 118 {
119 119 struct posix_acl *acl;
120 120  
... ... @@ -20,7 +20,7 @@
20 20  
21 21 #ifdef CONFIG_JFS_POSIX_ACL
22 22  
23   -int jfs_check_acl(struct inode *, int, unsigned int flags);
  23 +int jfs_check_acl(struct inode *, int);
24 24 int jfs_init_acl(tid_t, struct inode *, struct inode *);
25 25 int jfs_acl_chmod(struct inode *inode);
26 26  
... ... @@ -176,9 +176,9 @@
176 176 /*
177 177 * This does basic POSIX ACL permission checking
178 178 */
179   -static int acl_permission_check(struct inode *inode, int mask, unsigned int flags)
  179 +static int acl_permission_check(struct inode *inode, int mask)
180 180 {
181   - int (*check_acl)(struct inode *inode, int mask, unsigned int flags);
  181 + int (*check_acl)(struct inode *inode, int mask);
182 182 unsigned int mode = inode->i_mode;
183 183  
184 184 mask &= MAY_READ | MAY_WRITE | MAY_EXEC | MAY_NOT_BLOCK;
... ... @@ -191,7 +191,7 @@
191 191 else {
192 192 check_acl = inode->i_op->check_acl;
193 193 if (IS_POSIXACL(inode) && (mode & S_IRWXG) && check_acl) {
194   - int error = check_acl(inode, mask, flags);
  194 + int error = check_acl(inode, mask);
195 195 if (error != -EAGAIN)
196 196 return error;
197 197 }
... ... @@ -231,7 +231,7 @@
231 231 /*
232 232 * Do the basic POSIX ACL permission checks.
233 233 */
234   - ret = acl_permission_check(inode, mask, flags);
  234 + ret = acl_permission_check(inode, mask);
235 235 if (ret != -EACCES)
236 236 return ret;
237 237  
... ... @@ -327,7 +327,7 @@
327 327 if (likely(!ret))
328 328 goto ok;
329 329 } else {
330   - ret = acl_permission_check(inode, mask, flags);
  330 + ret = acl_permission_check(inode, mask);
331 331 if (likely(!ret))
332 332 goto ok;
333 333 if (ret != -EACCES)
... ... @@ -290,7 +290,7 @@
290 290 return ret;
291 291 }
292 292  
293   -int ocfs2_check_acl(struct inode *inode, int mask, unsigned int flags)
  293 +int ocfs2_check_acl(struct inode *inode, int mask)
294 294 {
295 295 struct ocfs2_super *osb;
296 296 struct buffer_head *di_bh = NULL;
... ... @@ -26,7 +26,7 @@
26 26 __le32 e_id;
27 27 };
28 28  
29   -extern int ocfs2_check_acl(struct inode *, int, unsigned int);
  29 +extern int ocfs2_check_acl(struct inode *, int);
30 30 extern int ocfs2_acl_chmod(struct inode *);
31 31 extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *,
32 32 struct buffer_head *, struct buffer_head *,
... ... @@ -868,7 +868,7 @@
868 868 return err;
869 869 }
870 870  
871   -int reiserfs_check_acl(struct inode *inode, int mask, unsigned int flags)
  871 +int reiserfs_check_acl(struct inode *inode, int mask)
872 872 {
873 873 struct posix_acl *acl;
874 874 int error = -EAGAIN; /* do regular unix permission checks by default */
fs/xfs/linux-2.6/xfs_acl.c
Diff comments   View file @ 7e40145
... ... @@ -219,7 +219,7 @@
219 219 }
220 220  
221 221 int
222   -xfs_check_acl(struct inode *inode, int mask, unsigned int flags)
  222 +xfs_check_acl(struct inode *inode, int mask)
223 223 {
224 224 struct xfs_inode *ip;
225 225 struct posix_acl *acl;
... ... @@ -42,7 +42,7 @@
42 42 #define SGI_ACL_DEFAULT_SIZE (sizeof(SGI_ACL_DEFAULT)-1)
43 43  
44 44 #ifdef CONFIG_XFS_POSIX_ACL
45   -extern int xfs_check_acl(struct inode *inode, int mask, unsigned int flags);
  45 +extern int xfs_check_acl(struct inode *inode, int mask);
46 46 extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);
47 47 extern int xfs_inherit_acl(struct inode *inode, struct posix_acl *default_acl);
48 48 extern int xfs_acl_chmod(struct inode *inode);
... ... @@ -1579,7 +1579,7 @@
1579 1579 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
1580 1580 void * (*follow_link) (struct dentry *, struct nameidata *);
1581 1581 int (*permission) (struct inode *, int, unsigned int);
1582   - int (*check_acl)(struct inode *, int, unsigned int);
  1582 + int (*check_acl)(struct inode *, int);
1583 1583  
1584 1584 int (*readlink) (struct dentry *, char __user *,int);
1585 1585 void (*put_link) (struct dentry *, struct nameidata *, void *);
include/linux/generic_acl.h
Diff comments   View file @ 7e40145
... ... @@ -10,7 +10,7 @@
10 10  
11 11 int generic_acl_init(struct inode *, struct inode *);
12 12 int generic_acl_chmod(struct inode *);
13   -int generic_check_acl(struct inode *inode, int mask, unsigned int flags);
  13 +int generic_check_acl(struct inode *inode, int mask);
14 14  
15 15 #endif /* LINUX_GENERIC_ACL_H */
include/linux/reiserfs_xattr.h
Diff comments   View file @ 7e40145
... ... @@ -45,7 +45,7 @@
45 45  
46 46 #ifdef CONFIG_REISERFS_FS_XATTR
47 47 #define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
48   -int reiserfs_check_acl(struct inode *inode, int mask, unsigned int flags);
  48 +int reiserfs_check_acl(struct inode *inode, int mask);
49 49 ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
50 50 void *buffer, size_t size);
51 51 int reiserfs_setxattr(struct dentry *dentry, const char *name,