dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Denis V. Lunev 2008-04-02 00:10:28 -07:00 committed by David S. Miller
parent 856f6ff7a3
commit c0f39322c3
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/linux/seq_file.h
View File

@ -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

27
include/linux/seq_file_net.h Normal file
View File

@ -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

2
include/net/net_namespace.h
View File

@ -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,