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/smack
parent95dbf739313f09c8d859bde1373bc264ef979337 (diff)
downloadkernel-common-83d498569e9a7a4b92c4c5d3566f2d6a604f28c9.tar.gz
kernel-common-83d498569e9a7a4b92c4c5d3566f2d6a604f28c9.tar.xz
kernel-common-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/smack')
-rw-r--r--security/smack/smack_lsm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 81c03a59711..8ef0199ebca 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1349,7 +1349,7 @@ static int smack_file_receive(struct file *file)
1349} 1349}
1350 1350
1351/** 1351/**
1352 * smack_dentry_open - Smack dentry open processing 1352 * smack_file_open - Smack dentry open processing
1353 * @file: the object 1353 * @file: the object
1354 * @cred: unused 1354 * @cred: unused
1355 * 1355 *
@@ -1357,7 +1357,7 @@ static int smack_file_receive(struct file *file)
1357 * 1357 *
1358 * Returns 0 1358 * Returns 0
1359 */ 1359 */
1360static int smack_dentry_open(struct file *file, const struct cred *cred) 1360static int smack_file_open(struct file *file, const struct cred *cred)
1361{ 1361{
1362 struct inode_smack *isp = file->f_path.dentry->d_inode->i_security; 1362 struct inode_smack *isp = file->f_path.dentry->d_inode->i_security;
1363 1363
@@ -3538,7 +3538,7 @@ struct security_operations smack_ops = {
3538 .file_send_sigiotask = smack_file_send_sigiotask, 3538 .file_send_sigiotask = smack_file_send_sigiotask,
3539 .file_receive = smack_file_receive, 3539 .file_receive = smack_file_receive,
3540 3540
3541 .dentry_open = smack_dentry_open, 3541 .file_open = smack_file_open,
3542 3542
3543 .cred_alloc_blank = smack_cred_alloc_blank, 3543 .cred_alloc_blank = smack_cred_alloc_blank,
3544 .cred_free = smack_cred_free, 3544 .cred_free = smack_cred_free,