lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NET] NETNS: Omit seq_net_private->net without CONFIG_NET_NS.

Browse Source 
Without CONFIG_NET_NS, no namespace other than &init_net exists,
no need to store net in seq_net_private.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
This commit is contained in:
YOSHIFUJI Hideaki
2008-03-26 02:36:06 +09:00
parent 3b1e0a655f
commit 1218854afa
12 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/netlink/af_netlink.c
View File

@ -1758,7 +1758,7 @@ static struct sock *netlink_seq_socket_idx(struct seq_file *seq, loff_t pos)
for (j = 0; j <= hash->mask; j++) {
sk_for_each(s, node, &hash->table[j]) {
if (sock_net(s) != iter->p.net)
if (sock_net(s) != seq_file_net(seq))
continue;
if (off == pos) {
iter->link = i;
@ -1794,7 +1794,7 @@ static void *netlink_seq_next(struct seq_file *seq, void *v, loff_t *pos)
s = v;
do {
s = sk_next(s);
} while (s && (sock_net(s) != iter->p.net));
} while (s && sock_net(s) != seq_file_net(seq));
if (s)
return s;
@ -1806,7 +1806,7 @@ static void *netlink_seq_next(struct seq_file *seq, void *v, loff_t *pos)
for (; j <= hash->mask; j++) {
s = sk_head(&hash->table[j]);
while (s && sock_net(s) != iter->p.net)
while (s && sock_net(s) != seq_file_net(seq))
s = sk_next(s);
if (s) {
iter->link = i;