audit: remove some duplicated includes
PATCH 1/1 audit: remove some duplicated includes
audit.h and skbuff.h are included twice.It's unnecessary. hence just remove them.
--- kernel/audit.c | 3 --- 1 file changed, 3 deletions(-)
kernel/audit.c +0 -3
@@ -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
Signature · 1 line
2.17.0
Paul Moore
maintainerQuoted 8 lines · Yangtao Li
audit.handskbuff.hare included twice.It's unnecessary. hence just remove them.Signed-off-by Yangtao Li <[email protected]>--- 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.
Quoted 18 lines
kernel/audit.c +0
-4@@ -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
Signature · 2 lines
paul moore www.paul-moore.com
Quoted 11 lines · Paul Moore
Quoted 8 lines · Yangtao Li
audit.handskbuff.hare included twice.It's unnecessary. hence just remove them.Signed-off-by Yangtao Li <[email protected]>--- kernel/audit.c | 3 --- 1 file changed, 3 deletions(-)
Quoted 8 lines
While there are two header files named
audit.h, they are different files as one lives ininclude/linux/audit.h, the other inkernel/audit.h. Granted,kernel/audit.hdoes include theinclude/linux/audit.hfile 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" inaudit.cto help make the dependencies explicit inaudit.citself.
Hi Paul:
How about fs.h and others?
MBR,
Yangtao
Quoted 23 lines
Quoted 18 lines
kernel/audit.c +0
-4@@ -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 --Quoted 1 line
2.17.0
--
paul moore
www.paul-moore.com
Paul Moore
maintainerQuoted 17 lines · Frank Lee
Quoted 16 lines · Paul Moore
Quoted 8 lines · Yangtao Li
audit.handskbuff.hare included twice.It's unnecessary. hence just remove them.Signed-off-by Yangtao Li <[email protected]>--- 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 ininclude/linux/audit.h, the other inkernel/audit.h. Granted,kernel/audit.hdoes include theinclude/linux/audit.hfile but it should be protected from multiple inclusion by the _LINUX_AUDIT_H_ definition.
Quoted 5 lines
Quoted 2 lines
I currently prefer to keep both <
linux/audit.h> and "audit.h" inaudit.cto help make the dependencies explicit inaudit.citself.Hi Paul:
How about
fs.hand 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.
Signature · 2 lines
paul moore www.paul-moore.com