summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-04-04 13:45:40 -0400
committerEric Paris <eparis@redhat.com>2012-04-09 12:22:50 -0400
commit83d498569e9a7a4b92c4c5d3566f2d6a604f28c9 (patch)
treee0d77f21bda5bec5ace52b3fa557f87b1bb57631 /security/apparmor
parent95dbf739313f09c8d859bde1373bc264ef979337 (diff)
downloadlinux-83d498569e9a7a4b92c4c5d3566f2d6a604f28c9.tar.bz2
SELinux: rename dentry_open to file_open
dentry_open takes a file, rename it to file_open Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/lsm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index ad05d391974d..02fddcd4c647 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -373,7 +373,7 @@ static int apparmor_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
AA_MAY_META_READ);
}
-static int apparmor_dentry_open(struct file *file, const struct cred *cred)
+static int apparmor_file_open(struct file *file, const struct cred *cred)
{
struct aa_file_cxt *fcxt = file->f_security;
struct aa_profile *profile;
@@ -640,9 +640,9 @@ static struct security_operations apparmor_ops = {
.path_chmod = apparmor_path_chmod,
.path_chown = apparmor_path_chown,
.path_truncate = apparmor_path_truncate,
- .dentry_open = apparmor_dentry_open,
.inode_getattr = apparmor_inode_getattr,
+ .file_open = apparmor_file_open,
.file_permission = apparmor_file_permission,
.file_alloc_security = apparmor_file_alloc_security,
.file_free_security = apparmor_file_free_security,