From 32eeb0052ec3cfdd3e31392bf029066b1f56fd89 Mon Sep 17 00:00:00 2001
From: Haisu Wang <haisuwang@tencent.com>
Date: Thu, 5 May 2022 10:49:37 +0800
Subject: [PATCH] Fix a mbuf circular dependency issue.

mbuf.h->cgroup.h->cgroup-defs.h
   ^                    |
   |                    |
   ----------------------

May led below warning/error:
In file included from /virtual/main.c:7:
In file included from include/linux/cgroup-defs.h:25:
In file included from include/linux/mbuf.h:6:
include/linux/cgroup.h:115:61: warning: declaration of 'struct cftype'
will not be visible outside of this function [-Wvisibility]
int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
                                                            ^
...
include/linux/cgroup.h:318:11: error: incomplete definition of type
'struct cgroup_subsys_state'
        if (!(css->flags & CSS_NO_REF))
              ~~~^
---
 include/linux/cgroup-defs.h | 1 -
 include/linux/mbuf.h        | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 0162a4026..eb345d08c 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -21,7 +21,6 @@
 #include <linux/workqueue.h>
 #include <linux/bpf-cgroup.h>
 #include <linux/psi_types.h>
-#include <linux/mbuf.h>
 
 #ifdef CONFIG_CGROUPS
 
diff --git a/include/linux/mbuf.h b/include/linux/mbuf.h
index 10d19870b..32779eee2 100644
--- a/include/linux/mbuf.h
+++ b/include/linux/mbuf.h
@@ -3,12 +3,12 @@
  * Copyright (C) 2021 bauerchen <bauerchen@tencent.com>
  */
 
-#include <linux/cgroup.h>
-#include <linux/rwsem.h>
-
 #ifndef _CGROUP_MBUF_H
 #define _CGROUP_MBUF_H
 
+#include <linux/cgroup.h>
+#include <linux/rwsem.h>
+
 struct mbuf_struct {
 	u32 mbuf_len;
 	u32 mbuf_max_slots;