diff options
Diffstat (limited to 'net/ipv4/proc.c')
-rw-r--r-- | net/ipv4/proc.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index 614958b7c276..eb62e58bff79 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <net/tcp.h> | 38 | #include <net/tcp.h> |
39 | #include <net/udp.h> | 39 | #include <net/udp.h> |
40 | #include <net/udplite.h> | 40 | #include <net/udplite.h> |
41 | #include <linux/bottom_half.h> | ||
41 | #include <linux/inetdevice.h> | 42 | #include <linux/inetdevice.h> |
42 | #include <linux/proc_fs.h> | 43 | #include <linux/proc_fs.h> |
43 | #include <linux/seq_file.h> | 44 | #include <linux/seq_file.h> |
@@ -50,13 +51,17 @@ | |||
50 | static int sockstat_seq_show(struct seq_file *seq, void *v) | 51 | static int sockstat_seq_show(struct seq_file *seq, void *v) |
51 | { | 52 | { |
52 | struct net *net = seq->private; | 53 | struct net *net = seq->private; |
54 | int orphans, sockets; | ||
55 | |||
56 | local_bh_disable(); | ||
57 | orphans = percpu_counter_sum_positive(&tcp_orphan_count), | ||
58 | sockets = percpu_counter_sum_positive(&tcp_sockets_allocated), | ||
59 | local_bh_enable(); | ||
53 | 60 | ||
54 | socket_seq_show(seq); | 61 | socket_seq_show(seq); |
55 | seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %d\n", | 62 | seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %d\n", |
56 | sock_prot_inuse_get(net, &tcp_prot), | 63 | sock_prot_inuse_get(net, &tcp_prot), orphans, |
57 | (int)percpu_counter_sum_positive(&tcp_orphan_count), | 64 | tcp_death_row.tw_count, sockets, |
58 | tcp_death_row.tw_count, | ||
59 | (int)percpu_counter_sum_positive(&tcp_sockets_allocated), | ||
60 | atomic_read(&tcp_memory_allocated)); | 65 | atomic_read(&tcp_memory_allocated)); |
61 | seq_printf(seq, "UDP: inuse %d mem %d\n", | 66 | seq_printf(seq, "UDP: inuse %d mem %d\n", |
62 | sock_prot_inuse_get(net, &udp_prot), | 67 | sock_prot_inuse_get(net, &udp_prot), |