aboutsummaryrefslogtreecommitdiffstats
path: root/net/ax25/af_ax25.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-06-17 22:05:41 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-18 03:29:12 -0400
commit31e6d363abcd0d05766c82f1a9c905a4c974a199 (patch)
treef2b5c46354d95f91e743ae748b8add0de8bffd17 /net/ax25/af_ax25.c
parentd3b238a03efd6d644ff93c8b10a1d38a596f2e34 (diff)
net: correct off-by-one write allocations reports
commit 2b85a34e911bf483c27cfdd124aeb1605145dc80 (net: No more expensive sock_hold()/sock_put() on each tx) changed initial sk_wmem_alloc value. We need to take into account this offset when reporting sk_wmem_alloc to user, in PROC_FS files or various ioctls (SIOCOUTQ/TIOCOUTQ) Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25/af_ax25.c')
-rw-r--r--net/ax25/af_ax25.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 61b35b955490..da0f64f82b57 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1690,7 +1690,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
1690 switch (cmd) { 1690 switch (cmd) {
1691 case TIOCOUTQ: { 1691 case TIOCOUTQ: {
1692 long amount; 1692 long amount;
1693 amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc); 1693
1694 amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
1694 if (amount < 0) 1695 if (amount < 0)
1695 amount = 0; 1696 amount = 0;
1696 res = put_user(amount, (int __user *)argp); 1697 res = put_user(amount, (int __user *)argp);
@@ -1780,8 +1781,8 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
1780 ax25_info.idletimer = ax25_display_timer(&ax25->idletimer) / (60 * HZ); 1781 ax25_info.idletimer = ax25_display_timer(&ax25->idletimer) / (60 * HZ);
1781 ax25_info.n2count = ax25->n2count; 1782 ax25_info.n2count = ax25->n2count;
1782 ax25_info.state = ax25->state; 1783 ax25_info.state = ax25->state;
1783 ax25_info.rcv_q = atomic_read(&sk->sk_rmem_alloc); 1784 ax25_info.rcv_q = sk_wmem_alloc_get(sk);
1784 ax25_info.snd_q = atomic_read(&sk->sk_wmem_alloc); 1785 ax25_info.snd_q = sk_rmem_alloc_get(sk);
1785 ax25_info.vs = ax25->vs; 1786 ax25_info.vs = ax25->vs;
1786 ax25_info.vr = ax25->vr; 1787 ax25_info.vr = ax25->vr;
1787 ax25_info.va = ax25->va; 1788 ax25_info.va = ax25->va;
@@ -1921,8 +1922,8 @@ static int ax25_info_show(struct seq_file *seq, void *v)
1921 1922
1922 if (ax25->sk != NULL) { 1923 if (ax25->sk != NULL) {
1923 seq_printf(seq, " %d %d %lu\n", 1924 seq_printf(seq, " %d %d %lu\n",
1924 atomic_read(&ax25->sk->sk_wmem_alloc), 1925 sk_wmem_alloc_get(ax25->sk),
1925 atomic_read(&ax25->sk->sk_rmem_alloc), 1926 sk_rmem_alloc_get(ax25->sk),
1926 sock_i_ino(ax25->sk)); 1927 sock_i_ino(ax25->sk));
1927 } else { 1928 } else {
1928 seq_puts(seq, " * * *\n"); 1929 seq_puts(seq, " * * *\n");