Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0f39322 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 856f6ff7

include/linux/seq_file.h

+0 −22
Original line number Diff line number Diff line
@@ -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

include/linux/seq_file_net.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#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

include/net/net_namespace.h

+2 −0
Original line number Diff line number Diff line
@@ -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,