* [PATCH] apparmor: Remove the repeated declaration
@ 2021-05-29 8:40 Shaokun Zhang
2021-06-01 22:48 ` John Johansen
0 siblings, 1 reply; 2+ messages in thread
From: Shaokun Zhang @ 2021-05-29 8:40 UTC (permalink / raw)
To: linux-security-module
Cc: Shaokun Zhang, John Johansen, James Morris, Serge E. Hallyn
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(-)
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 */
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] apparmor: Remove the repeated declaration
2021-05-29 8:40 [PATCH] apparmor: Remove the repeated declaration Shaokun Zhang
@ 2021-06-01 22:48 ` John Johansen
0 siblings, 0 replies; 2+ messages in thread
From: John Johansen @ 2021-06-01 22:48 UTC (permalink / raw)
To: Shaokun Zhang, linux-security-module; +Cc: James Morris, Serge E. Hallyn
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 */
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-01 22:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-29 8:40 [PATCH] apparmor: Remove the repeated declaration Shaokun Zhang
2021-06-01 22:48 ` John Johansen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.