| Message ID | 20240304163655.771616-1-colin.i.king@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [next] apparmor: remove useless static inline function is_deleted | expand |
On 3/4/24 08:36, Colin Ian King wrote: > The inlined function is_deleted is redundant, it is not called at all > from any function in security/apparmor/file.c and so it can be removed. > > Cleans up clang scan build warning: > security/apparmor/file.c:153:20: warning: unused function > 'is_deleted' [-Wunused-function] > > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Acked-by: John Johansen <john.johanse@canonical.com> I have pulled this into my tree > --- > security/apparmor/file.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/security/apparmor/file.c b/security/apparmor/file.c > index c03eb7c19f16..d52a5b14dad4 100644 > --- a/security/apparmor/file.c > +++ b/security/apparmor/file.c > @@ -144,19 +144,6 @@ int aa_audit_file(const struct cred *subj_cred, > return aa_audit(type, profile, &ad, 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, const struct cred *subj_cred, > struct aa_label *label, > const struct path *path, int flags, char *buffer,
diff --git a/security/apparmor/file.c b/security/apparmor/file.c index c03eb7c19f16..d52a5b14dad4 100644 --- a/security/apparmor/file.c +++ b/security/apparmor/file.c @@ -144,19 +144,6 @@ int aa_audit_file(const struct cred *subj_cred, return aa_audit(type, profile, &ad, 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, const struct cred *subj_cred, struct aa_label *label, const struct path *path, int flags, char *buffer,
The inlined function is_deleted is redundant, it is not called at all from any function in security/apparmor/file.c and so it can be removed. Cleans up clang scan build warning: security/apparmor/file.c:153:20: warning: unused function 'is_deleted' [-Wunused-function] Signed-off-by: Colin Ian King <colin.i.king@gmail.com> --- security/apparmor/file.c | 13 ------------- 1 file changed, 13 deletions(-)