While the #ifdef guards prevent the circular include from blowing up, policy.h does not actually need anything from net.h. Remove, that include and instead include net.h in the other files that need it.
Signed-off-by: Ryan Lee <[email protected]> --- security/apparmor/af_unix.c | 1 + security/apparmor/apparmorfs.c | 1 + security/apparmor/include/policy.h | 1 - security/apparmor/policy.c | 1 + security/apparmor/policy_unpack.c | 1 + 5 files changed, 4 insertions(+), 1 deletions(-) This patch applies cleanly to upstream master, excluding the af_inet changes because security/apparmor/af_inet.c does not exist upstream. diff --git a/security/apparmor/af_unix.c b/security/apparmor/af_unix.c index f8f7d17a61ca..543f18121be3 100644 --- a/security/apparmor/af_unix.c +++ b/security/apparmor/af_unix.c @@ -20,6 +20,7 @@ #include "include/apparmor.h" #include "include/file.h" #include "include/label.h" +#include "include/net.h" #include "include/path.h" #include "include/policy.h" #include "include/cred.h" diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 6b18775705f9..2253f4b7fd48 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -33,6 +33,7 @@ #include "include/crypto.h" #include "include/ipc.h" #include "include/label.h" +#include "include/net.h" #include "include/policy.h" #include "include/policy_ns.h" #include "include/resource.h" diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h index e3cf1a03f79d..855657b3d2b9 100644 --- a/security/apparmor/include/policy.h +++ b/security/apparmor/include/policy.h @@ -26,7 +26,6 @@ #include "file.h" #include "lib.h" #include "label.h" -#include "net.h" #include "perms.h" #include "resource.h" diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index 7fa346000aa9..9ae858a203bc 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -81,6 +81,7 @@ #include "include/file.h" #include "include/ipc.h" #include "include/match.h" +#include "include/net.h" #include "include/path.h" #include "include/policy.h" #include "include/policy_ns.h" diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index 74cdfdd43d7e..7d4dd17a97be 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -25,6 +25,7 @@ #include "include/crypto.h" #include "include/file.h" #include "include/match.h" +#include "include/net.h" #include "include/path.h" #include "include/policy.h" #include "include/policy_unpack.h" -- 2.43.0
