diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-18 04:05:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-18 09:29:12 +0200 |
| commit | 31e6d363abcd0d05766c82f1a9c905a4c974a199 (patch) | |
| tree | f2b5c46354d95f91e743ae748b8add0de8bffd17 /net/netrom/af_netrom.c | |
| parent | via-velocity : fix no link detection on boot (diff) | |
| download | linux-31e6d363abcd0d05766c82f1a9c905a4c974a199.tar.xz linux-31e6d363abcd0d05766c82f1a9c905a4c974a199.zip | |
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/netrom/af_netrom.c')
| -rw-r--r-- | net/netrom/af_netrom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index cd911904cbe1..ce51ce012cda 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1205,7 +1205,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) long amount; lock_sock(sk); - amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc); + amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); if (amount < 0) amount = 0; release_sock(sk); @@ -1341,8 +1341,8 @@ static int nr_info_show(struct seq_file *seq, void *v) nr->n2count, nr->n2, nr->window, - atomic_read(&s->sk_wmem_alloc), - atomic_read(&s->sk_rmem_alloc), + sk_wmem_alloc_get(s), + sk_rmem_alloc_get(s), s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L); bh_unlock_sock(s); |