aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
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/selinux
parent95dbf739313f09c8d859bde1373bc264ef979337 (diff)
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/selinux')
-rw-r--r--security/selinux/hooks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f7d7e779c7f3..dc15f16a357c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2973,7 +2973,7 @@ static int selinux_file_permission(struct file *file, int mask)
2973 2973
2974 if (sid == fsec->sid && fsec->isid == isec->sid && 2974 if (sid == fsec->sid && fsec->isid == isec->sid &&
2975 fsec->pseqno == avc_policy_seqno()) 2975 fsec->pseqno == avc_policy_seqno())
2976 /* No change since dentry_open check. */ 2976 /* No change since file_open check. */
2977 return 0; 2977 return 0;
2978 2978
2979 return selinux_revalidate_file_permission(file, mask); 2979 return selinux_revalidate_file_permission(file, mask);
@@ -3232,7 +3232,7 @@ static int selinux_file_receive(struct file *file)
3232 return file_has_perm(cred, file, file_to_av(file)); 3232 return file_has_perm(cred, file, file_to_av(file));
3233} 3233}
3234 3234
3235static int selinux_dentry_open(struct file *file, const struct cred *cred) 3235static int selinux_file_open(struct file *file, const struct cred *cred)
3236{ 3236{
3237 struct file_security_struct *fsec; 3237 struct file_security_struct *fsec;
3238 struct inode *inode; 3238 struct inode *inode;
@@ -5596,7 +5596,7 @@ static struct security_operations selinux_ops = {
5596 .file_send_sigiotask = selinux_file_send_sigiotask, 5596 .file_send_sigiotask = selinux_file_send_sigiotask,
5597 .file_receive = selinux_file_receive, 5597 .file_receive = selinux_file_receive,
5598 5598
5599 .dentry_open = selinux_dentry_open, 5599 .file_open = selinux_file_open,
5600 5600
5601 .task_create = selinux_task_create, 5601 .task_create = selinux_task_create,
5602 .cred_alloc_blank = selinux_cred_alloc_blank, 5602 .cred_alloc_blank = selinux_cred_alloc_blank,