diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-31 19:43:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-31 19:43:18 -0700 |
| commit | fd4e7b50455330403ed5b1060055f9d411ecdc57 (patch) | |
| tree | a5cd0e7156354f37f28569efc63a42de85c361b7 /net/ipv4/proc.c | |
| parent | d0538ca3554a3985c09921903cf8f5e38fa56123 (diff) | |
| download | linux-fd4e7b50455330403ed5b1060055f9d411ecdc57.tar.gz linux-fd4e7b50455330403ed5b1060055f9d411ecdc57.tar.bz2 linux-fd4e7b50455330403ed5b1060055f9d411ecdc57.zip | |
[IPV4][NETNS]: Display per-net info in sockstat file.
Besides, now we can see per-net fragments statistics in the
same file, since this stats is already per-net.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/proc.c')
| -rw-r--r-- | net/ipv4/proc.c | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index 24ae23bb5124..552169b41b16 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -51,27 +51,54 @@ */ static int sockstat_seq_show(struct seq_file *seq, void *v) { + struct net *net = seq->private; + socket_seq_show(seq); seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %d\n", - sock_prot_inuse_get(&init_net, &tcp_prot), + sock_prot_inuse_get(net, &tcp_prot), atomic_read(&tcp_orphan_count), tcp_death_row.tw_count, atomic_read(&tcp_sockets_allocated), atomic_read(&tcp_memory_allocated)); seq_printf(seq, "UDP: inuse %d mem %d\n", - sock_prot_inuse_get(&init_net, &udp_prot), + sock_prot_inuse_get(net, &udp_prot), atomic_read(&udp_memory_allocated)); seq_printf(seq, "UDPLITE: inuse %d\n", - sock_prot_inuse_get(&init_net, &udplite_prot)); + sock_prot_inuse_get(net, &udplite_prot)); seq_printf(seq, "RAW: inuse %d\n", - sock_prot_inuse_get(&init_net, &raw_prot)); + sock_prot_inuse_get(net, &raw_prot)); seq_printf(seq, "FRAG: inuse %d memory %d\n", - ip_frag_nqueues(&init_net), ip_frag_mem(&init_net)); + ip_frag_nqueues(net), ip_frag_mem(net)); return 0; } static int sockstat_seq_open(struct inode *inode, struct file *file) { - return single_open(file, sockstat_seq_show, NULL); + int err; + struct net *net; + + err = -ENXIO; + net = get_proc_net(inode); + if (net == NULL) + goto err_net; + + err = single_open(file, sockstat_seq_show, net); + if (err < 0) + goto err_open; + + return 0; + +err_open: + put_net(net); +err_net: + return err; +} + +static int sockstat_seq_release(struct inode *inode, struct file *file) +{ + struct net *net = ((struct seq_file *)file->private_data)->private; + + put_net(net); + return single_release(inode, file); } static const struct file_operations sockstat_seq_fops = { @@ -79,7 +106,7 @@ static const struct file_operations sockstat_seq_fops = { .open = sockstat_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = single_release, + .release = sockstat_seq_release, }; /* snmp items */ |