Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 885ee74d authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

af_unix: Move CINQ/COUTQ code to helpers 



Currently tcp diag reports rqlen and wqlen values similar to how
the CINQ/COUTQ iotcls do. To make unix diag report these values
in the same way move the respective code into helpers.

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

include/net/af_unix.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ struct unix_sock { 


#define peer_wait peer_wq.wait



long unix_inq_len(struct sock *sk);

long unix_outq_len(struct sock *sk);



#ifdef CONFIG_SYSCTL

extern int unix_sysctl_register(struct net *net);

extern void unix_sysctl_unregister(struct net *net);

net/unix/af_unix.c

+36 −23
Original line number Diff line number Diff line
@@ -2065,25 +2065,13 @@ static int unix_shutdown(struct socket *sock, int mode) 
	return 0;

}



static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

	struct sock *sk = sock->sk;

	long amount = 0;

	int err;



	switch (cmd) {

	case SIOCOUTQ:

		amount = sk_wmem_alloc_get(sk);

		err = put_user(amount, (int __user *)arg);

		break;

	case SIOCINQ:

long unix_inq_len(struct sock *sk)

{

	struct sk_buff *skb;

	long amount = 0;



			if (sk->sk_state == TCP_LISTEN) {

				err = -EINVAL;

				break;

			}

	if (sk->sk_state == TCP_LISTEN)

		return -EINVAL;



	spin_lock(&sk->sk_receive_queue.lock);

	if (sk->sk_type == SOCK_STREAM ||
@@ -2096,10 +2084,35 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
			amount = skb->len;

	}

	spin_unlock(&sk->sk_receive_queue.lock);

			err = put_user(amount, (int __user *)arg);

			break;



	return amount;

}

EXPORT_SYMBOL_GPL(unix_inq_len);



long unix_outq_len(struct sock *sk)

{

	return sk_wmem_alloc_get(sk);

}

EXPORT_SYMBOL_GPL(unix_outq_len);



static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

	struct sock *sk = sock->sk;

	long amount = 0;

	int err;



	switch (cmd) {

	case SIOCOUTQ:

		amount = unix_outq_len(sk);

		err = put_user(amount, (int __user *)arg);

		break;

	case SIOCINQ:

		amount = unix_inq_len(sk);

		if (amount < 0)

			err = amount;

		else

			err = put_user(amount, (int __user *)arg);

		break;

	default:

		err = -ENOIOCTLCMD;

		break;