On 8/16/23 06:10, Yue Haibing wrote:
Commit f1bd904175e8 ("apparmor: add the base fns() for domain labels")
declared but never implemented aa_label_make_newest().
Commit 98849dff90e2 ("apparmor: rename namespace to ns to improve code line
lengths")
declared but never implemented aa_free_ns_kref().
Signed-off-by: Yue Haibing <[email protected]>
Acked-by: John Johansen <[email protected]>
this has pulled into apparmor-next-next so it will land
next cycle
---
security/apparmor/include/label.h | 3 ---
security/apparmor/include/policy_ns.h | 2 --
2 files changed, 5 deletions(-)
diff --git a/security/apparmor/include/label.h
b/security/apparmor/include/label.h
index 2a72e6b17d68..c952a0b07855 100644
--- a/security/apparmor/include/label.h
+++ b/security/apparmor/include/label.h
@@ -288,9 +288,6 @@ struct aa_profile *__aa_label_next_not_in_set(struct
label_it *I,
bool aa_label_remove(struct aa_label *label);
struct aa_label *aa_label_insert(struct aa_labelset *ls, struct aa_label *l);
bool aa_label_replace(struct aa_label *old, struct aa_label *new);
-bool aa_label_make_newest(struct aa_labelset *ls, struct aa_label *old,
- struct aa_label *new);
-
struct aa_label *aa_label_find(struct aa_label *l);
struct aa_profile *aa_label_next_in_merge(struct label_it *I,
diff --git a/security/apparmor/include/policy_ns.h
b/security/apparmor/include/policy_ns.h
index 33d665516fc1..d52311e86d23 100644
--- a/security/apparmor/include/policy_ns.h
+++ b/security/apparmor/include/policy_ns.h
@@ -86,8 +86,6 @@ const char *aa_ns_name(struct aa_ns *parent, struct aa_ns
*child, bool subns);
void aa_free_ns(struct aa_ns *ns);
int aa_alloc_root_ns(void);
void aa_free_root_ns(void);
-void aa_free_ns_kref(struct kref *kref);
-
struct aa_ns *aa_find_ns(struct aa_ns *root, const char *name);
struct aa_ns *aa_findn_ns(struct aa_ns *root, const char *name, size_t n);
struct aa_ns *__aa_lookupn_ns(struct aa_ns *view, const char *hname, size_t
n);
