diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-09 20:04:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-09 20:04:54 -0700 |
| commit | 526b678093a8a4bcf1ffffbe17bcf21c057eddf5 (patch) | |
| tree | 6c0a5b35783f1e89406b667c9c525571d1b4d24e /fs/ext4/acl.h | |
| parent | 752015d1b0683a8c623ebfe4c62893413e9b30d3 (diff) | |
| parent | 18f4c644773bc8de1fd9c5182b30c231aafb94ef (diff) | |
Merge branch 'lookup-permissions-cleanup'
* lookup-permissions-cleanup:
jffs2/jfs/xfs: switch over to 'check_acl' rather than 'permission()'
ext[234]: move over to 'check_acl' permission model
shmfs: use 'check_acl' instead of 'permission'
Make 'check_acl()' a first-class filesystem op
Simplify exec_permission_lite(), part 3
Simplify exec_permission_lite() further
Simplify exec_permission_lite() logic
Do not call 'ima_path_check()' for each path component
Diffstat (limited to 'fs/ext4/acl.h')
| -rw-r--r-- | fs/ext4/acl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h index 949789d2bba6..9d843d5deac4 100644 --- a/fs/ext4/acl.h +++ b/fs/ext4/acl.h @@ -54,13 +54,13 @@ static inline int ext4_acl_count(size_t size) #ifdef CONFIG_EXT4_FS_POSIX_ACL /* acl.c */ -extern int ext4_permission(struct inode *, int); +extern int ext4_check_acl(struct inode *, int); extern int ext4_acl_chmod(struct inode *); extern int ext4_init_acl(handle_t *, struct inode *, struct inode *); #else /* CONFIG_EXT4_FS_POSIX_ACL */ #include <linux/sched.h> -#define ext4_permission NULL +#define ext4_check_acl NULL static inline int ext4_acl_chmod(struct inode *inode) |