Discussion:
[PATCH] audit: remove some duplicated includes
Add Reply
Yangtao Li
2018-11-26 14:51:07 UTC
Reply
Permalink
audit.h and skbuff.h are included twice.It's unnecessary.
hence just remove them.

Signed-off-by: Yangtao Li <***@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
Paul Moore
2018-11-26 23:35:48 UTC
Reply
Permalink
Post by Yangtao Li
audit.h and skbuff.h are included twice.It's unnecessary.
hence just remove them.
---
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.
Post by Yangtao Li
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
Paul Moore
2018-11-27 22:19:23 UTC
Reply
Permalink
Post by Paul Moore
Post by Yangtao Li
audit.h and skbuff.h are included twice.It's unnecessary.
hence just remove them.
---
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.
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
Loading...