aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris2012-04-04 12:45:40 -0500
committerEric Paris2012-04-09 11:22:50 -0500
commit83d498569e9a7a4b92c4c5d3566f2d6a604f28c9 (patch)
treee0d77f21bda5bec5ace52b3fa557f87b1bb57631 /security/apparmor
parent95dbf739313f09c8d859bde1373bc264ef979337 (diff)
downloadam43-linux-kernel-83d498569e9a7a4b92c4c5d3566f2d6a604f28c9.tar.gz
am43-linux-kernel-83d498569e9a7a4b92c4c5d3566f2d6a604f28c9.tar.xz
am43-linux-kernel-83d498569e9a7a4b92c4c5d3566f2d6a604f28c9.zip
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 ad05d391974..02fddcd4c64 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)
373 AA_MAY_META_READ); 373 AA_MAY_META_READ);
374} 374}
375 375
376static int apparmor_dentry_open(struct file *file, const struct cred *cred) 376static int apparmor_file_open(struct file *file, const struct cred *cred)
377{ 377{
378 struct aa_file_cxt *fcxt = file->f_security; 378 struct aa_file_cxt *fcxt = file->f_security;
379 struct aa_profile *profile; 379 struct aa_profile *profile;
@@ -640,9 +640,9 @@ static struct security_operations apparmor_ops = {
640 .path_chmod = apparmor_path_chmod, 640 .path_chmod = apparmor_path_chmod,
641 .path_chown = apparmor_path_chown, 641 .path_chown = apparmor_path_chown,
642 .path_truncate = apparmor_path_truncate, 642 .path_truncate = apparmor_path_truncate,
643 .dentry_open = apparmor_dentry_open,
644 .inode_getattr = apparmor_inode_getattr, 643 .inode_getattr = apparmor_inode_getattr,
645 644
645 .file_open = apparmor_file_open,
646 .file_permission = apparmor_file_permission, 646 .file_permission = apparmor_file_permission,
647 .file_alloc_security = apparmor_file_alloc_security, 647 .file_alloc_security = apparmor_file_alloc_security,
648 .file_free_security = apparmor_file_free_security, 648 .file_free_security = apparmor_file_free_security,