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 /fs/gfs2/inode.c | |
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 'fs/gfs2/inode.c')
-rw-r--r-- | fs/gfs2/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 0fb51a96eff0..900cf986aadc 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -1846,7 +1846,7 @@ const struct inode_operations gfs2_file_iops = { | |||
1846 | .listxattr = gfs2_listxattr, | 1846 | .listxattr = gfs2_listxattr, |
1847 | .removexattr = gfs2_removexattr, | 1847 | .removexattr = gfs2_removexattr, |
1848 | .fiemap = gfs2_fiemap, | 1848 | .fiemap = gfs2_fiemap, |
1849 | .check_acl = gfs2_check_acl, | 1849 | .get_acl = gfs2_get_acl, |
1850 | }; | 1850 | }; |
1851 | 1851 | ||
1852 | const struct inode_operations gfs2_dir_iops = { | 1852 | const struct inode_operations gfs2_dir_iops = { |
@@ -1867,7 +1867,7 @@ const struct inode_operations gfs2_dir_iops = { | |||
1867 | .listxattr = gfs2_listxattr, | 1867 | .listxattr = gfs2_listxattr, |
1868 | .removexattr = gfs2_removexattr, | 1868 | .removexattr = gfs2_removexattr, |
1869 | .fiemap = gfs2_fiemap, | 1869 | .fiemap = gfs2_fiemap, |
1870 | .check_acl = gfs2_check_acl, | 1870 | .get_acl = gfs2_get_acl, |
1871 | }; | 1871 | }; |
1872 | 1872 | ||
1873 | const struct inode_operations gfs2_symlink_iops = { | 1873 | const struct inode_operations gfs2_symlink_iops = { |
@@ -1882,6 +1882,6 @@ const struct inode_operations gfs2_symlink_iops = { | |||
1882 | .listxattr = gfs2_listxattr, | 1882 | .listxattr = gfs2_listxattr, |
1883 | .removexattr = gfs2_removexattr, | 1883 | .removexattr = gfs2_removexattr, |
1884 | .fiemap = gfs2_fiemap, | 1884 | .fiemap = gfs2_fiemap, |
1885 | .check_acl = gfs2_check_acl, | 1885 | .get_acl = gfs2_get_acl, |
1886 | }; | 1886 | }; |
1887 | 1887 | ||