diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-06-20 19:12:17 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:43:21 -0400 |
commit | 7e40145eb111a5192e6d819f764db9d6828d1abb (patch) | |
tree | 3249952a751de12465e8d66c63328445e9242f3a /include/linux | |
parent | 9c2c703929e4c41210cfa6e3f599514421bab8dc (diff) |
->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>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fs.h | 2 | ||||
-rw-r--r-- | include/linux/generic_acl.h | 2 | ||||
-rw-r--r-- | include/linux/reiserfs_xattr.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 60c1fe65bb2d..f218b42718aa 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1579,7 +1579,7 @@ struct inode_operations { | |||
1579 | struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *); | 1579 | struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *); |
1580 | void * (*follow_link) (struct dentry *, struct nameidata *); | 1580 | void * (*follow_link) (struct dentry *, struct nameidata *); |
1581 | int (*permission) (struct inode *, int, unsigned int); | 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 | int (*readlink) (struct dentry *, char __user *,int); | 1584 | int (*readlink) (struct dentry *, char __user *,int); |
1585 | void (*put_link) (struct dentry *, struct nameidata *, void *); | 1585 | void (*put_link) (struct dentry *, struct nameidata *, void *); |
diff --git a/include/linux/generic_acl.h b/include/linux/generic_acl.h index 0437e377b555..574bea4013b6 100644 --- a/include/linux/generic_acl.h +++ b/include/linux/generic_acl.h | |||
@@ -10,6 +10,6 @@ extern const struct xattr_handler generic_acl_default_handler; | |||
10 | 10 | ||
11 | int generic_acl_init(struct inode *, struct inode *); | 11 | int generic_acl_init(struct inode *, struct inode *); |
12 | int generic_acl_chmod(struct inode *); | 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 | #endif /* LINUX_GENERIC_ACL_H */ | 15 | #endif /* LINUX_GENERIC_ACL_H */ |
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h index 1a3ca8f80200..424ba6416e7c 100644 --- a/include/linux/reiserfs_xattr.h +++ b/include/linux/reiserfs_xattr.h | |||
@@ -45,7 +45,7 @@ int reiserfs_permission(struct inode *inode, int mask, unsigned int flags); | |||
45 | 45 | ||
46 | #ifdef CONFIG_REISERFS_FS_XATTR | 46 | #ifdef CONFIG_REISERFS_FS_XATTR |
47 | #define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir) | 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 | ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name, | 49 | ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name, |
50 | void *buffer, size_t size); | 50 | void *buffer, size_t size); |
51 | int reiserfs_setxattr(struct dentry *dentry, const char *name, | 51 | int reiserfs_setxattr(struct dentry *dentry, const char *name, |