summaryrefslogtreecommitdiffstats
path: root/net/unix
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2011-12-30 09:27:43 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-30 16:44:24 -0500
commit257b529876cb45ec791eaa89e3d2ee0d16b49383 (patch)
treea052a1d16ae992cbfa5234af0cbfcea3a6cff6d7 /net/unix
parentc0636faa539ec4205ec50e80844a5b0454b4bbaa (diff)
downloadlinux-257b529876cb45ec791eaa89e3d2ee0d16b49383.tar.gz
linux-257b529876cb45ec791eaa89e3d2ee0d16b49383.tar.bz2
linux-257b529876cb45ec791eaa89e3d2ee0d16b49383.zip
unix_diag: Add the MEMINFO extension
[ Fix indentation of sock_diag*() calls. -DaveM ] Signed-off-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/diag.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c
index c5bdbcb1c30b..98945f29da4f 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -127,23 +127,27 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r
sock_diag_save_cookie(sk, rep->udiag_cookie);
if ((req->udiag_show & UDIAG_SHOW_NAME) &&
- sk_diag_dump_name(sk, skb))
+ sk_diag_dump_name(sk, skb))
goto nlmsg_failure;
if ((req->udiag_show & UDIAG_SHOW_VFS) &&
- sk_diag_dump_vfs(sk, skb))
+ sk_diag_dump_vfs(sk, skb))
goto nlmsg_failure;
if ((req->udiag_show & UDIAG_SHOW_PEER) &&
- sk_diag_dump_peer(sk, skb))
+ sk_diag_dump_peer(sk, skb))
goto nlmsg_failure;
if ((req->udiag_show & UDIAG_SHOW_ICONS) &&
- sk_diag_dump_icons(sk, skb))
+ sk_diag_dump_icons(sk, skb))
goto nlmsg_failure;
if ((req->udiag_show & UDIAG_SHOW_RQLEN) &&
- sk_diag_show_rqlen(sk, skb))
+ sk_diag_show_rqlen(sk, skb))
+ goto nlmsg_failure;
+
+ if ((req->udiag_show & UDIAG_SHOW_MEMINFO) &&
+ sock_diag_put_meminfo(sk, skb, UNIX_DIAG_MEMINFO))
goto nlmsg_failure;
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
@@ -191,9 +195,9 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (!(req->udiag_states & (1 << sk->sk_state)))
goto next;
if (sk_diag_dump(sk, skb, req,
- NETLINK_CB(cb->skb).pid,
- cb->nlh->nlmsg_seq,
- NLM_F_MULTI) < 0)
+ NETLINK_CB(cb->skb).pid,
+ cb->nlh->nlmsg_seq,
+ NLM_F_MULTI) < 0)
goto done;
next:
num++;