| Message ID | 20220129025101.38355-3-yang.lee@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next,1/3] apparmor: Fix match_mnt_path_str() and match_mnt() kernel-doc comment | expand |
On 1/28/22 18:51, Yang Li wrote: > Don't use /** for non-kernel-doc comments and change function name > aa_mangle_name to mangle_name in kernel-doc comment to Remove some > warnings found by running scripts/kernel-doc, which is caused by > using 'make W=1'. > > security/apparmor/apparmorfs.c:1503: warning: Cannot understand * > on line 1503 - I thought it was a doc line > security/apparmor/apparmorfs.c:1530: warning: Cannot understand * > on line 1530 - I thought it was a doc line > security/apparmor/apparmorfs.c:1892: warning: Cannot understand * > on line 1892 - I thought it was a doc line > security/apparmor/apparmorfs.c:108: warning: expecting prototype for > aa_mangle_name(). Prototype was for mangle_name() instead > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> Acked-by: John Johansen <john.johansen@canonical.com> I have pulled this into my tree > --- > security/apparmor/apparmorfs.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c > index 15efe4076fc4..4d7df859542d 100644 > --- a/security/apparmor/apparmorfs.c > +++ b/security/apparmor/apparmorfs.c > @@ -98,7 +98,7 @@ static struct rawdata_f_data *rawdata_f_data_alloc(size_t size) > #endif > > /** > - * aa_mangle_name - mangle a profile name to std profile layout form > + * mangle_name - mangle a profile name to std profile layout form > * @name: profile name to mangle (NOT NULL) > * @target: buffer to store mangled name, same length as @name (MAYBE NULL) > * > @@ -1499,7 +1499,7 @@ int __aa_fs_create_rawdata(struct aa_ns *ns, struct aa_loaddata *rawdata) > > /** fns to setup dynamic per profile/namespace files **/ > > -/** > +/* > * > * Requires: @profile->ns->lock held > */ > @@ -1526,7 +1526,7 @@ void __aafs_profile_rmdir(struct aa_profile *profile) > } > } > > -/** > +/* > * > * Requires: @old->ns->lock held > */ > @@ -1888,7 +1888,7 @@ static void __aa_fs_list_remove_rawdata(struct aa_ns *ns) > __aa_fs_remove_rawdata(ent); > } > > -/** > +/* > * > * Requires: @ns->lock held > */
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 15efe4076fc4..4d7df859542d 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -98,7 +98,7 @@ static struct rawdata_f_data *rawdata_f_data_alloc(size_t size) #endif /** - * aa_mangle_name - mangle a profile name to std profile layout form + * mangle_name - mangle a profile name to std profile layout form * @name: profile name to mangle (NOT NULL) * @target: buffer to store mangled name, same length as @name (MAYBE NULL) * @@ -1499,7 +1499,7 @@ int __aa_fs_create_rawdata(struct aa_ns *ns, struct aa_loaddata *rawdata) /** fns to setup dynamic per profile/namespace files **/ -/** +/* * * Requires: @profile->ns->lock held */ @@ -1526,7 +1526,7 @@ void __aafs_profile_rmdir(struct aa_profile *profile) } } -/** +/* * * Requires: @old->ns->lock held */ @@ -1888,7 +1888,7 @@ static void __aa_fs_list_remove_rawdata(struct aa_ns *ns) __aa_fs_remove_rawdata(ent); } -/** +/* * * Requires: @ns->lock held */
Don't use /** for non-kernel-doc comments and change function name aa_mangle_name to mangle_name in kernel-doc comment to Remove some warnings found by running scripts/kernel-doc, which is caused by using 'make W=1'. security/apparmor/apparmorfs.c:1503: warning: Cannot understand * on line 1503 - I thought it was a doc line security/apparmor/apparmorfs.c:1530: warning: Cannot understand * on line 1530 - I thought it was a doc line security/apparmor/apparmorfs.c:1892: warning: Cannot understand * on line 1892 - I thought it was a doc line security/apparmor/apparmorfs.c:108: warning: expecting prototype for aa_mangle_name(). Prototype was for mangle_name() instead Reported-by: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> --- security/apparmor/apparmorfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)