[NETNS]: Do not include net/net_namespace.h from seq_file.h

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 5da70c3f4417ef857e9d9ed6fba2d70cc9bcfcc5..1da1e6208a0a645d1804fe310fd20817c6539ca6 100644 (file)
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -5,7 +5,6 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/mutex.h>
-#include <net/net_namespace.h>
 
 struct seq_operations;
 struct file;
@@ -63,26 +62,5 @@ extern struct list_head *seq_list_start_head(struct list_head *head,
 extern struct list_head *seq_list_next(void *v, struct list_head *head,
                loff_t *ppos);
 
-#ifdef CONFIG_NET
-struct net;
-struct seq_net_private {
-#ifdef CONFIG_NET_NS
-       struct net *net;
-#endif
-};
-
-int seq_open_net(struct inode *, struct file *,
-                const struct seq_operations *, int);
-int seq_release_net(struct inode *, struct file *);
-static inline struct net *seq_file_net(struct seq_file *seq)
-{
-#ifdef CONFIG_NET_NS
-       return ((struct seq_net_private *)seq->private)->net;
-#else
-       return &init_net;
-#endif
-}
-#endif /* CONFIG_NET */
-
 #endif
 #endif

diff --git a/include/linux/seq_file_net.h b/include/linux/seq_file_net.h
new file mode 100644 (file)
index 0000000..4ac5254
--- /dev/null
+++ b/include/linux/seq_file_net.h
@@ -0,0 +1,27 @@
+#ifndef __SEQ_FILE_NET_H__
+#define __SEQ_FILE_NET_H__
+
+#include <linux/seq_file.h>
+
+struct net;
+extern struct net init_net;
+
+struct seq_net_private {
+#ifdef CONFIG_NET_NS
+       struct net *net;
+#endif
+};
+
+int seq_open_net(struct inode *, struct file *,
+                const struct seq_operations *, int);
+int seq_release_net(struct inode *, struct file *);
+static inline struct net *seq_file_net(struct seq_file *seq)
+{
+#ifdef CONFIG_NET_NS
+       return ((struct seq_net_private *)seq->private)->net;
+#else
+       return &init_net;
+#endif
+}
+
+#endif

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 4a37037b1d17c7e73edc5c851fe066dbe3bc0170..6c9a48a46685c6ee719acaa3312ef92c27eec51a 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -61,6 +61,8 @@ struct net {
 
 
 #ifdef CONFIG_NET
+#include <linux/seq_file_net.h>
+
 /* Init's network namespace */
 extern struct net init_net;
 #define INIT_NET_NS(net_ns) .net_ns = &init_net,