From patchwork Wed Aug 16 13:10:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yue Haibing X-Patchwork-Id: 13355162 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09C10C001E0 for ; Wed, 16 Aug 2023 13:10:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbjHPNK0 (ORCPT ); Wed, 16 Aug 2023 09:10:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245461AbjHPNKT (ORCPT ); Wed, 16 Aug 2023 09:10:19 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB6132712 for ; Wed, 16 Aug 2023 06:10:13 -0700 (PDT) Received: from canpemm500007.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RQpN55RmQzVjvT; Wed, 16 Aug 2023 21:08:05 +0800 (CST) Received: from localhost (10.174.179.215) by canpemm500007.china.huawei.com (7.192.104.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 16 Aug 2023 21:10:11 +0800 From: Yue Haibing To: , , , , CC: , Subject: [PATCH -next] apparmor: Remove unused declarations Date: Wed, 16 Aug 2023 21:10:10 +0800 Message-ID: <20230816131010.39320-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.179.215] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500007.china.huawei.com (7.192.104.62) X-CFilter-Loop: Reflected Precedence: bulk List-ID: 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 Acked-by: John Johansen --- 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);