8:51 a.m.
audit.h and skbuff.h are included twice.It's unnecessary.
hence just remove them.
Signed-off-by: Yangtao Li <tiny.windzz(a)gmail.com>
---
kernel/audit.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/kernel/audit.c b/kernel/audit.c
index 2a8058764aa6..a677715891d0 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -62,11 +62,8 @@
#include <linux/pid.h>
#include <linux/slab.h>
-#include <linux/audit.h>
-
#include <net/sock.h>
#include <net/netlink.h>
-#include <linux/skbuff.h>
#ifdef CONFIG_SECURITY
#include <linux/security.h>
#endif
--
2.17.0
5:35 p.m.
On Mon, Nov 26, 2018 at 9:51 AM Yangtao Li <tiny.windzz(a)gmail.com> wrote:
audit.h and skbuff.h are included twice.It's unnecessary.
hence just remove them.
Signed-off-by: Yangtao Li <tiny.windzz(a)gmail.com>
---
kernel/audit.c | 3 ---
1 file changed, 3 deletions(-)
While there are two header files named audit.h, they are different
files as one lives in include/linux/audit.h, the other in
kernel/audit.h. Granted, kernel/audit.h does include the
include/linux/audit.h file but it should be protected from multiple
inclusion by the _LINUX_AUDIT_H_ definition.
I currently prefer to keep both <linux/audit.h> and "audit.h" in
audit.c to help make the dependencies explicit in audit.c itself.
diff --git a/kernel/audit.c b/kernel/audit.c
index 2a8058764aa6..a677715891d0 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -62,11 +62,8 @@
#include <linux/pid.h>
#include <linux/slab.h>
-#include <linux/audit.h>
-
#include <net/sock.h>
#include <net/netlink.h>
-#include <linux/skbuff.h>
#ifdef CONFIG_SECURITY
#include <linux/security.h>
#endif
--
2.17.0
--
paul moore
www.paul-moore.com
7:03 p.m.
On Tue, Nov 27, 2018 at 7:36 AM Paul Moore <paul(a)paul-moore.com> wrote:
On Mon, Nov 26, 2018 at 9:51 AM Yangtao Li <tiny.windzz(a)gmail.com> wrote:
>
> audit.h and skbuff.h are included twice.It's unnecessary.
> hence just remove them.
>
> Signed-off-by: Yangtao Li <tiny.windzz(a)gmail.com>
> ---
> kernel/audit.c | 3 ---
> 1 file changed, 3 deletions(-)
While there are two header files named audit.h, they are different
files as one lives in include/linux/audit.h, the other in
kernel/audit.h. Granted, kernel/audit.h does include the
include/linux/audit.h file but it should be protected from multiple
inclusion by the _LINUX_AUDIT_H_ definition.
I currently prefer to keep both <linux/audit.h> and "audit.h" in
audit.c to help make the dependencies explicit in audit.c itself.
Hi Paul:
How about fs.h and others?
MBR,
Yangtao
> diff --git a/kernel/audit.c b/kernel/audit.c
> index 2a8058764aa6..a677715891d0 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -62,11 +62,8 @@
> #include <linux/pid.h>
> #include <linux/slab.h>
>
> -#include <linux/audit.h>
> -
> #include <net/sock.h>
> #include <net/netlink.h>
> -#include <linux/skbuff.h>
> #ifdef CONFIG_SECURITY
> #include <linux/security.h>
> #endif
> --
> 2.17.0
--
paul moore
www.paul-moore.com
4:19 p.m.
On Mon, Nov 26, 2018 at 8:03 PM Frank Lee <tiny.windzz(a)gmail.com> wrote:
On Tue, Nov 27, 2018 at 7:36 AM Paul Moore
<paul(a)paul-moore.com> wrote:
> On Mon, Nov 26, 2018 at 9:51 AM Yangtao Li <tiny.windzz(a)gmail.com> wrote:
> >
> > audit.h and skbuff.h are included twice.It's unnecessary.
> > hence just remove them.
> >
> > Signed-off-by: Yangtao Li <tiny.windzz(a)gmail.com>
> > ---
> > kernel/audit.c | 3 ---
> > 1 file changed, 3 deletions(-)
>
> While there are two header files named audit.h, they are different
> files as one lives in include/linux/audit.h, the other in
> kernel/audit.h. Granted, kernel/audit.h does include the
> include/linux/audit.h file but it should be protected from multiple
> inclusion by the _LINUX_AUDIT_H_ definition.
>
> I currently prefer to keep both <linux/audit.h> and "audit.h" in
> audit.c to help make the dependencies explicit in audit.c itself.
Hi Paul:
How about fs.h and others?
In the case of linux/fs.h, I believe that you wanted to remove it
because we are already including linux/fsnotify_backend.h (or
similar), yes? In that case I think it comes down to a similar idea:
keep linux/fs.h when we are directly referencing a function, variable,
etc. that is declared in linux/fs.h. Needless to say, I would take
the same position with other header files.
If you can find a case where we are not making any direct references
to something in a header file, I'm happy to merge a patch which
removes that include.
--
paul moore
www.paul-moore.com
2216
days inactive
2217
days old
linux-audit@lists.linux-audit.osci.io
3 comments
3 participants
participants (3)
-
Frank Lee -
Paul Moore -
Yangtao Li