Commit f4b41f06 authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by David S. Miller
Browse files

net: remove noblock parameter from skb_recv_datagram() 



skb_recv_datagram() has two parameters 'flags' and 'noblock' that are
merged inside skb_recv_datagram() by 'flags | (noblock ? MSG_DONTWAIT : 0)'

As 'flags' may contain MSG_DONTWAIT as value most callers split the 'flags'
into 'flags' and 'noblock' with finally obsolete bit operations like this:

skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, flags & MSG_DONTWAIT, &rc);

And this is not even done consistently with the 'flags' parameter.

This patch removes the obsolete and costly splitting into two parameters
and only performs bit operations when really needed on the caller side.

One missing conversion thankfully reported by kernel test robot. I missed
to enable kunit tests to build the mctp code.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b5c21bb

drivers/isdn/mISDN/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ mISDN_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, 
	if (sk->sk_state == MISDN_CLOSED)

		return 0;



	skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);

	skb = skb_recv_datagram(sk, flags, &err);

	if (!skb)

		return err;

drivers/net/ppp/pppoe.c

+1 −2
Original line number Diff line number Diff line
@@ -1011,8 +1011,7 @@ static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, 
		goto end;

	}



	skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,

				flags & MSG_DONTWAIT, &error);

	skb = skb_recv_datagram(sk, flags, &error);

	if (error < 0)

		goto end;

include/linux/skbuff.h

+1 −2
Original line number Diff line number Diff line
@@ -3836,8 +3836,7 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, 
struct sk_buff *__skb_recv_datagram(struct sock *sk,

				    struct sk_buff_head *sk_queue,

				    unsigned int flags, int *off, int *err);

struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,

				  int *err);

struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned int flags, int *err);

__poll_t datagram_poll(struct file *file, struct socket *sock,

			   struct poll_table_struct *wait);

int skb_copy_datagram_iter(const struct sk_buff *from, int offset,

net/appletalk/ddp.c

+1 −2
Original line number Diff line number Diff line
@@ -1753,8 +1753,7 @@ static int atalk_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, 
	int err = 0;

	struct sk_buff *skb;



	skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,

						flags & MSG_DONTWAIT, &err);

	skb = skb_recv_datagram(sk, flags, &err);

	lock_sock(sk);



	if (!skb)

net/atm/common.c

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, 
	    !test_bit(ATM_VF_READY, &vcc->flags))

		return 0;



	skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &error);

	skb = skb_recv_datagram(sk, flags, &error);

	if (!skb)

		return error;