Commit 257b5298 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

unix_diag: Add the MEMINFO extension 



[ Fix indentation of sock_diag*() calls. -DaveM ]

Signed-off-by: default avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0636faa

include/linux/unix_diag.h

+2 −0
Original line number Diff line number Diff line
@@ -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,

};

net/unix/diag.c

+12 −8
Original line number Diff line number Diff line
@@ -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;