apparmor: make __aa_path_perm() static

Make __aa_path_perm() static as it's only used inside apparmor/file.c.

Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index d7f2784..e7dc5ea 100644 (file)
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -220,9 +220,10 @@ aa_state_t aa_str_perms(struct aa_policydb *file_rules, aa_state_t start,
        return state;
 }
 
-int __aa_path_perm(const char *op, struct aa_profile *profile, const char *name,
-                  u32 request, struct path_cond *cond, int flags,
-                  struct aa_perms *perms)
+static int __aa_path_perm(const char *op, struct aa_profile *profile,
+                         const char *name, u32 request,
+                         struct path_cond *cond, int flags,
+                         struct aa_perms *perms)
 {
        struct aa_ruleset *rules = list_first_entry(&profile->rules,
                                                    typeof(*rules), list);

diff --git a/security/apparmor/include/file.h b/security/apparmor/include/file.h
index 1a1c0f0..5be620a 100644 (file)
--- a/security/apparmor/include/file.h
+++ b/security/apparmor/include/file.h
@@ -119,9 +119,6 @@ aa_state_t aa_str_perms(struct aa_policydb *file_rules, aa_state_t start,
                        const char *name, struct path_cond *cond,
                        struct aa_perms *perms);
 
-int __aa_path_perm(const char *op, struct aa_profile *profile,
-                  const char *name, u32 request, struct path_cond *cond,
-                  int flags, struct aa_perms *perms);
 int aa_path_perm(const char *op, struct aa_label *label,
                 const struct path *path, int flags, u32 request,
                 struct path_cond *cond);