Message ID | 20220718063022.129998-1-yang.lee@linux.alibaba.com (mailing list archive) |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | [-next] apparmor: Fix some kernel-doc comments | expand |
On 7/17/22 23:30, Yang Li wrote: > Remove warnings found by running scripts/kernel-doc, which is caused by > using 'make W=1'. > security/apparmor/policy_ns.c:65: warning: Function parameter or member 'curr' not described in 'aa_ns_name' > security/apparmor/policy_ns.c:65: warning: Function parameter or member 'view' not described in 'aa_ns_name' > security/apparmor/policy_ns.c:65: warning: Function parameter or member 'subns' not described in 'aa_ns_name' > security/apparmor/policy_ns.c:65: warning: expecting prototype for aa_na_name(). Prototype was for aa_ns_name() instead > security/apparmor/policy_ns.c:214: warning: Function parameter or member 'view' not described in '__aa_lookupn_ns' > security/apparmor/policy_ns.c:214: warning: Excess function parameter 'base' description in '__aa_lookupn_ns' > security/apparmor/policy_ns.c:297: warning: expecting prototype for aa_create_ns(). Prototype was for __aa_find_or_create_ns() instead > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> thanks I have pulled this into apparmor-next Acked-by: John Johansen <john.johansen@canonical.com> > --- > security/apparmor/policy_ns.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c > index 300953a02a24..0ef268d6554d 100644 > --- a/security/apparmor/policy_ns.c > +++ b/security/apparmor/policy_ns.c > @@ -54,10 +54,10 @@ bool aa_ns_visible(struct aa_ns *curr, struct aa_ns *view, bool subns) > } > > /** > - * aa_na_name - Find the ns name to display for @view from @curr > - * @curr - current namespace (NOT NULL) > - * @view - namespace attempting to view (NOT NULL) > - * @subns - are subns visible > + * aa_ns_name - Find the ns name to display for @view from @curr > + * @curr: current namespace (NOT NULL) > + * @view: namespace attempting to view (NOT NULL) > + * @subns: are subns visible > * > * Returns: name of @view visible from @curr > */ > @@ -200,7 +200,7 @@ struct aa_ns *aa_find_ns(struct aa_ns *root, const char *name) > > /** > * __aa_lookupn_ns - lookup the namespace matching @hname > - * @base: base list to start looking up profile name from (NOT NULL) > + * @view: namespace to search in (NOT NULL) > * @hname: hierarchical ns name (NOT NULL) > * @n: length of @hname > * > @@ -285,7 +285,7 @@ static struct aa_ns *__aa_create_ns(struct aa_ns *parent, const char *name, > } > > /** > - * aa_create_ns - create an ns, fail if it already exists > + * __aa_find_or_create_ns - create an ns, fail if it already exists > * @parent: the parent of the namespace being created > * @name: the name of the namespace > * @dir: if not null the dir to put the ns entries in
diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c index 300953a02a24..0ef268d6554d 100644 --- a/security/apparmor/policy_ns.c +++ b/security/apparmor/policy_ns.c @@ -54,10 +54,10 @@ bool aa_ns_visible(struct aa_ns *curr, struct aa_ns *view, bool subns) } /** - * aa_na_name - Find the ns name to display for @view from @curr - * @curr - current namespace (NOT NULL) - * @view - namespace attempting to view (NOT NULL) - * @subns - are subns visible + * aa_ns_name - Find the ns name to display for @view from @curr + * @curr: current namespace (NOT NULL) + * @view: namespace attempting to view (NOT NULL) + * @subns: are subns visible * * Returns: name of @view visible from @curr */ @@ -200,7 +200,7 @@ struct aa_ns *aa_find_ns(struct aa_ns *root, const char *name) /** * __aa_lookupn_ns - lookup the namespace matching @hname - * @base: base list to start looking up profile name from (NOT NULL) + * @view: namespace to search in (NOT NULL) * @hname: hierarchical ns name (NOT NULL) * @n: length of @hname * @@ -285,7 +285,7 @@ static struct aa_ns *__aa_create_ns(struct aa_ns *parent, const char *name, } /** - * aa_create_ns - create an ns, fail if it already exists + * __aa_find_or_create_ns - create an ns, fail if it already exists * @parent: the parent of the namespace being created * @name: the name of the namespace * @dir: if not null the dir to put the ns entries in
Remove warnings found by running scripts/kernel-doc, which is caused by using 'make W=1'. security/apparmor/policy_ns.c:65: warning: Function parameter or member 'curr' not described in 'aa_ns_name' security/apparmor/policy_ns.c:65: warning: Function parameter or member 'view' not described in 'aa_ns_name' security/apparmor/policy_ns.c:65: warning: Function parameter or member 'subns' not described in 'aa_ns_name' security/apparmor/policy_ns.c:65: warning: expecting prototype for aa_na_name(). Prototype was for aa_ns_name() instead security/apparmor/policy_ns.c:214: warning: Function parameter or member 'view' not described in '__aa_lookupn_ns' security/apparmor/policy_ns.c:214: warning: Excess function parameter 'base' description in '__aa_lookupn_ns' security/apparmor/policy_ns.c:297: warning: expecting prototype for aa_create_ns(). Prototype was for __aa_find_or_create_ns() instead Reported-by: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> --- security/apparmor/policy_ns.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)