fsnotify: split fsnotify_perm() into two hooks

[linux-2.6-block.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index dcb3e7014f9bdd4b6115f0407c5b1d7d3a588e9c..d7f3703c590560204b8c10f37cb8eefe8cfe6a23 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -2586,7 +2586,7 @@ int security_file_permission(struct file *file, int mask)
        if (ret)
                return ret;
 
-       return fsnotify_perm(file, mask);
+       return fsnotify_file_perm(file, mask);
 }
 
 /**
@@ -2837,7 +2837,7 @@ int security_file_open(struct file *file)
        if (ret)
                return ret;
 
-       return fsnotify_perm(file, MAY_OPEN);
+       return fsnotify_open_perm(file);
 }
 
 /**