diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-17 19:05:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-18 00:29:12 -0700 |
| commit | 31e6d363abcd0d05766c82f1a9c905a4c974a199 (patch) | |
| tree | f2b5c46354d95f91e743ae748b8add0de8bffd17 /net/appletalk | |
| parent | d3b238a03efd6d644ff93c8b10a1d38a596f2e34 (diff) | |
| download | kernel_samsung_tuna-31e6d363abcd0d05766c82f1a9c905a4c974a199.zip kernel_samsung_tuna-31e6d363abcd0d05766c82f1a9c905a4c974a199.tar.gz kernel_samsung_tuna-31e6d363abcd0d05766c82f1a9c905a4c974a199.tar.bz2 | |
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/appletalk')
| -rw-r--r-- | net/appletalk/atalk_proc.c | 4 | ||||
| -rw-r--r-- | net/appletalk/ddp.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c index fd8e084..80caad1 100644 --- a/net/appletalk/atalk_proc.c +++ b/net/appletalk/atalk_proc.c @@ -204,8 +204,8 @@ static int atalk_seq_socket_show(struct seq_file *seq, void *v) "%02X %d\n", s->sk_type, ntohs(at->src_net), at->src_node, at->src_port, ntohs(at->dest_net), at->dest_node, at->dest_port, - atomic_read(&s->sk_wmem_alloc), - atomic_read(&s->sk_rmem_alloc), + sk_wmem_alloc_get(s), + sk_rmem_alloc_get(s), s->sk_state, SOCK_INODE(s->sk_socket)->i_uid); out: return 0; diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index f7a53b2..590b839 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1748,8 +1748,7 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) switch (cmd) { /* Protocol layer */ case TIOCOUTQ: { - long amount = sk->sk_sndbuf - - atomic_read(&sk->sk_wmem_alloc); + long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); if (amount < 0) amount = 0; |