kill check_acl callback of generic_permission()

its value depends only on inode and does not change; we might as
well store it in ->i_op->check_acl and be done with that.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-06-20 11:31:30 -04:00
parent 07b8ce1ee8
commit 178ea73521
20 changed files with 47 additions and 37 deletions

View File

@@ -1293,7 +1293,7 @@ int ocfs2_permission(struct inode *inode, int mask, unsigned int flags)
goto out;
}
ret = generic_permission(inode, mask, flags, ocfs2_check_acl);
ret = generic_permission(inode, mask, flags);
ocfs2_inode_unlock(inode, 0);
out:
@@ -2593,12 +2593,14 @@ const struct inode_operations ocfs2_file_iops = {
.listxattr = ocfs2_listxattr,
.removexattr = generic_removexattr,
.fiemap = ocfs2_fiemap,
.check_acl = ocfs2_check_acl,
};
const struct inode_operations ocfs2_special_file_iops = {
.setattr = ocfs2_setattr,
.getattr = ocfs2_getattr,
.permission = ocfs2_permission,
.check_acl = ocfs2_check_acl,
};
/*