diff options
author | Christoph Hellwig <hch@lst.de> | 2011-07-23 11:37:31 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:30:23 -0400 |
commit | 4e34e719e457f2e031297175410fc0bd4016a085 (patch) | |
tree | ab969a371e0d2efc6bfbf503ca6cdfce3af3bf6c /mm | |
parent | edde854e8bb34a7f32fa993d721f1da0faf64165 (diff) |
fs: take the ACL checks to common code
Replace the ->check_acl method with a ->get_acl method that simply reads an
ACL from disk after having a cache miss. This means we can replace the ACL
checking boilerplate code with a single implementation in namei.c.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/shmem.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index fcedf5464eb7..3e519798b522 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -2715,10 +2715,6 @@ static const struct inode_operations shmem_inode_operations = { | |||
2715 | .listxattr = shmem_listxattr, | 2715 | .listxattr = shmem_listxattr, |
2716 | .removexattr = shmem_removexattr, | 2716 | .removexattr = shmem_removexattr, |
2717 | #endif | 2717 | #endif |
2718 | #ifdef CONFIG_TMPFS_POSIX_ACL | ||
2719 | .check_acl = generic_check_acl, | ||
2720 | #endif | ||
2721 | |||
2722 | }; | 2718 | }; |
2723 | 2719 | ||
2724 | static const struct inode_operations shmem_dir_inode_operations = { | 2720 | static const struct inode_operations shmem_dir_inode_operations = { |
@@ -2741,7 +2737,6 @@ static const struct inode_operations shmem_dir_inode_operations = { | |||
2741 | #endif | 2737 | #endif |
2742 | #ifdef CONFIG_TMPFS_POSIX_ACL | 2738 | #ifdef CONFIG_TMPFS_POSIX_ACL |
2743 | .setattr = shmem_setattr, | 2739 | .setattr = shmem_setattr, |
2744 | .check_acl = generic_check_acl, | ||
2745 | #endif | 2740 | #endif |
2746 | }; | 2741 | }; |
2747 | 2742 | ||
@@ -2754,7 +2749,6 @@ static const struct inode_operations shmem_special_inode_operations = { | |||
2754 | #endif | 2749 | #endif |
2755 | #ifdef CONFIG_TMPFS_POSIX_ACL | 2750 | #ifdef CONFIG_TMPFS_POSIX_ACL |
2756 | .setattr = shmem_setattr, | 2751 | .setattr = shmem_setattr, |
2757 | .check_acl = generic_check_acl, | ||
2758 | #endif | 2752 | #endif |
2759 | }; | 2753 | }; |
2760 | 2754 | ||