diff options
| author | Gaosheng Cui <cuigaosheng1@huawei.com> | 2022-09-26 05:28:39 +0300 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2022-10-25 08:35:11 +0300 |
| commit | 2f7a29debae2efef94b981377fa3622986cd57f5 (patch) | |
| tree | 0de4ca6170bfd6ee0b2f880df7d6429ae3393bf9 | |
| parent | 53991aedcd34760be23f1b0ef312e39b6add84af (diff) | |
| download | linux-2f7a29debae2efef94b981377fa3622986cd57f5.tar.xz | |
apparmor: remove useless static inline functions
Remove the following useless static inline functions:
1. label_is_visible() is a static function in
security/apparmor/label.c, and it's not used, aa_ns_visible()
can do the same things as it, so it's redundant.
2. is_deleted() is a static function in security/apparmor/file.c,
and it's not used since commit aebd873e8d3e ("apparmor: refactor
path name lookup and permission checks around labels"), so it's
redundant.
They are redundant, so remove them.
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
| -rw-r--r-- | security/apparmor/file.c | 13 | ||||
| -rw-r--r-- | security/apparmor/label.c | 6 |
2 files changed, 0 insertions, 19 deletions
diff --git a/security/apparmor/file.c b/security/apparmor/file.c index e7dc5ea38997..deb73480f0c6 100644 --- a/security/apparmor/file.c +++ b/security/apparmor/file.c @@ -141,19 +141,6 @@ int aa_audit_file(struct aa_profile *profile, struct aa_perms *perms, return aa_audit(type, profile, &sa, file_audit_cb); } -/** - * is_deleted - test if a file has been completely unlinked - * @dentry: dentry of file to test for deletion (NOT NULL) - * - * Returns: true if deleted else false - */ -static inline bool is_deleted(struct dentry *dentry) -{ - if (d_unlinked(dentry) && d_backing_inode(dentry)->i_nlink == 0) - return true; - return false; -} - static int path_name(const char *op, struct aa_label *label, const struct path *path, int flags, char *buffer, const char **name, struct path_cond *cond, u32 request) diff --git a/security/apparmor/label.c b/security/apparmor/label.c index aa4031628af5..8a2af96f4da5 100644 --- a/security/apparmor/label.c +++ b/security/apparmor/label.c @@ -1256,12 +1256,6 @@ out: return label; } -static inline bool label_is_visible(struct aa_profile *profile, - struct aa_label *label) -{ - return aa_ns_visible(profile->ns, labels_ns(label), true); -} - /* match a profile and its associated ns component if needed * Assumes visibility test has already been done. * If a subns profile is not to be matched should be prescreened with |