On Mon, Mar 16, 2026 at 02:59:31PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <[email protected]> > > The newly introduced function is only used in an #ifdef block, > which causes a harmless warning: > > security/apparmor/apparmorfs.c:177:28: error: 'get_loaddata_common_ref' > defined but not used [-Werror=unused-function] > 177 | static struct aa_loaddata *get_loaddata_common_ref(struct > aa_common_ref *ref) > > Move the definition next to the user to avoid the warning. > > Fixes: 8e135b8aee5a ("apparmor: fix race between freeing data and fs > accessing it") > Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Serge Hallyn <[email protected]> > --- > Alternatively, the #ifdef checks could be replaced with an > 'if(IS_ENABLED(CONFIG_SECURITY_APPARMOR_EXPORT_BINARY) return;' > check in __aa_fs_create_rawdata(), relying on the compiler's > dead code elimination. > --- > security/apparmor/apparmorfs.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c > index ededaf46f3ca..f762b101d682 100644 > --- a/security/apparmor/apparmorfs.c > +++ b/security/apparmor/apparmorfs.c > @@ -174,14 +174,6 @@ static struct aa_proxy *get_proxy_common_ref(struct > aa_common_ref *ref) > return NULL; > } > > -static struct aa_loaddata *get_loaddata_common_ref(struct aa_common_ref *ref) > -{ > - if (ref) > - return aa_get_i_loaddata(container_of(ref, struct aa_loaddata, > - count)); > - return NULL; > -} > - > static void aa_put_common_ref(struct aa_common_ref *ref) > { > if (!ref) > @@ -1318,6 +1310,14 @@ static const struct file_operations seq_rawdata_ > ##NAME ##_fops = { \ > .release = seq_rawdata_release, \ > } \ > > +static struct aa_loaddata *get_loaddata_common_ref(struct aa_common_ref *ref) > +{ > + if (ref) > + return aa_get_i_loaddata(container_of(ref, struct aa_loaddata, > + count)); > + return NULL; > +} > + > static int seq_rawdata_open(struct inode *inode, struct file *file, > int (*show)(struct seq_file *, void *)) > { > -- > 2.39.5
