aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r--fs/ocfs2/file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index b1e35a392ca5..d058cb7e12d4 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1293,7 +1293,7 @@ int ocfs2_permission(struct inode *inode, int mask, unsigned int flags)
1293 goto out; 1293 goto out;
1294 } 1294 }
1295 1295
1296 ret = generic_permission(inode, mask, flags, ocfs2_check_acl); 1296 ret = generic_permission(inode, mask, flags);
1297 1297
1298 ocfs2_inode_unlock(inode, 0); 1298 ocfs2_inode_unlock(inode, 0);
1299out: 1299out:
@@ -2593,12 +2593,14 @@ const struct inode_operations ocfs2_file_iops = {
2593 .listxattr = ocfs2_listxattr, 2593 .listxattr = ocfs2_listxattr,
2594 .removexattr = generic_removexattr, 2594 .removexattr = generic_removexattr,
2595 .fiemap = ocfs2_fiemap, 2595 .fiemap = ocfs2_fiemap,
2596 .check_acl = ocfs2_check_acl,
2596}; 2597};
2597 2598
2598const struct inode_operations ocfs2_special_file_iops = { 2599const struct inode_operations ocfs2_special_file_iops = {
2599 .setattr = ocfs2_setattr, 2600 .setattr = ocfs2_setattr,
2600 .getattr = ocfs2_getattr, 2601 .getattr = ocfs2_getattr,
2601 .permission = ocfs2_permission, 2602 .permission = ocfs2_permission,
2603 .check_acl = ocfs2_check_acl,
2602}; 2604};
2603 2605
2604/* 2606/*