Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / security / security.c

diff --git a/security/security.c b/security/security.c
index bf619ffc9a4d2b81053b62eafe5fffd7a8d9524f..5497a57fba0154a24b1b87835930e6cc685f855b 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -701,11 +701,11 @@ int security_file_receive(struct file *file)
        return security_ops->file_receive(file);
 }
 
-int security_dentry_open(struct file *file, const struct cred *cred)
+int security_file_open(struct file *file, const struct cred *cred)
 {
        int ret;
 
-       ret = security_ops->dentry_open(file, cred);
+       ret = security_ops->file_open(file, cred);
        if (ret)
                return ret;