| Submitter | Pavel Emelyanov |
|---|---|
| Date | Dec. 30, 2011, 7:27 p.m. |
| Message ID | <4EFE10AF.8010308@parallels.com> |
| Download | mbox | patch |
| Permalink | /patch/133694/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Pavel Emelyanov <xemul@parallels.com> Date: Fri, 30 Dec 2011 23:27:43 +0400 > Signed-off-by: Pavel Emelyanov <xemul@parallels.com> Applied with some minor indentation fixes, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/include/linux/unix_diag.h b/include/linux/unix_diag.h index a5ce0f3..93fdb78 100644 --- a/include/linux/unix_diag.h +++ b/include/linux/unix_diag.h @@ -18,6 +18,7 @@ struct unix_diag_req { #define UDIAG_SHOW_PEER 0x00000004 /* show peer socket info */ #define UDIAG_SHOW_ICONS 0x00000008 /* show pending connections */ #define UDIAG_SHOW_RQLEN 0x00000010 /* show skb receive queue len */ +#define UDIAG_SHOW_MEMINFO 0x00000020 /* show memory info of a socket */ struct unix_diag_msg { __u8 udiag_family; @@ -35,6 +36,7 @@ enum { UNIX_DIAG_PEER, UNIX_DIAG_ICONS, UNIX_DIAG_RQLEN, + UNIX_DIAG_MEMINFO, UNIX_DIAG_MAX, }; diff --git a/net/unix/diag.c b/net/unix/diag.c index c5bdbcb..9517bdd 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -146,6 +146,10 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r 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; return skb->len;
Signed-off-by: Pavel Emelyanov <xemul@parallels.com> --- include/linux/unix_diag.h | 2 ++ net/unix/diag.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-)