diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-09 23:04:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-09 23:04:54 -0400 |
| commit | 526b678093a8a4bcf1ffffbe17bcf21c057eddf5 (patch) | |
| tree | 6c0a5b35783f1e89406b667c9c525571d1b4d24e /fs/jffs2/acl.c | |
| 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/jffs2/acl.c')
| -rw-r--r-- | fs/jffs2/acl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c index 8fcb6239218e..7edb62e97419 100644 --- a/fs/jffs2/acl.c +++ b/fs/jffs2/acl.c | |||
| @@ -258,7 +258,7 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl) | |||
| 258 | return rc; | 258 | return rc; |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | static int jffs2_check_acl(struct inode *inode, int mask) | 261 | int jffs2_check_acl(struct inode *inode, int mask) |
| 262 | { | 262 | { |
| 263 | struct posix_acl *acl; | 263 | struct posix_acl *acl; |
| 264 | int rc; | 264 | int rc; |
| @@ -274,11 +274,6 @@ static int jffs2_check_acl(struct inode *inode, int mask) | |||
| 274 | return -EAGAIN; | 274 | return -EAGAIN; |
| 275 | } | 275 | } |
| 276 | 276 | ||
| 277 | int jffs2_permission(struct inode *inode, int mask) | ||
| 278 | { | ||
| 279 | return generic_permission(inode, mask, jffs2_check_acl); | ||
| 280 | } | ||
| 281 | |||
| 282 | int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) | 277 | int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) |
| 283 | { | 278 | { |
| 284 | struct posix_acl *acl, *clone; | 279 | struct posix_acl *acl, *clone; |