| Message ID | 1622277648-27803-1-git-send-email-zhangshaokun@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | apparmor: Remove the repeated declaration | expand |
On 5/29/21 1:40 AM, Shaokun Zhang wrote: > Function 'aa_labelset_destroy' and 'aa_labelset_init' are declared > twice, so remove the repeated declaration and unnecessary blank line. > > Cc: John Johansen <john.johansen@canonical.com> > Cc: James Morris <jmorris@namei.org> > Cc: "Serge E. Hallyn" <serge@hallyn.com> > Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com> Thanks, Acked-by: John Johansen <john.johansen@canonical.com> I have pulled this into my tree > --- > security/apparmor/include/label.h | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/security/apparmor/include/label.h b/security/apparmor/include/label.h > index 1e90384b1523..18b290f73b8b 100644 > --- a/security/apparmor/include/label.h > +++ b/security/apparmor/include/label.h > @@ -77,10 +77,6 @@ struct aa_labelset { > #define __labelset_for_each(LS, N) \ > for ((N) = rb_first(&(LS)->root); (N); (N) = rb_next(N)) > > -void aa_labelset_destroy(struct aa_labelset *ls); > -void aa_labelset_init(struct aa_labelset *ls); > - > - > enum label_flags { > FLAG_HAT = 1, /* profile is a hat */ > FLAG_UNCONFINED = 2, /* label unconfined only if all */ >
diff --git a/security/apparmor/include/label.h b/security/apparmor/include/label.h index 1e90384b1523..18b290f73b8b 100644 --- a/security/apparmor/include/label.h +++ b/security/apparmor/include/label.h @@ -77,10 +77,6 @@ struct aa_labelset { #define __labelset_for_each(LS, N) \ for ((N) = rb_first(&(LS)->root); (N); (N) = rb_next(N)) -void aa_labelset_destroy(struct aa_labelset *ls); -void aa_labelset_init(struct aa_labelset *ls); - - enum label_flags { FLAG_HAT = 1, /* profile is a hat */ FLAG_UNCONFINED = 2, /* label unconfined only if all */
Function 'aa_labelset_destroy' and 'aa_labelset_init' are declared twice, so remove the repeated declaration and unnecessary blank line. Cc: John Johansen <john.johansen@canonical.com> Cc: James Morris <jmorris@namei.org> Cc: "Serge E. Hallyn" <serge@hallyn.com> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com> --- security/apparmor/include/label.h | 4 ---- 1 file changed, 4 deletions(-)