Commit b6be5ba8 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jakub Kicinski
Browse files

socket: Remove unused kernel_sendmsg_locked 



The last use of kernel_sendmsg_locked() was removed in 2023 by
commit dc97391e ("sock: Remove ->sendpage*() in favour of
sendmsg(MSG_SPLICE_PAGES)")

Remove it.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarJoe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250112131318.63753-1-linux@treblig.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b01b59a4

include/linux/net.h

+0 −2
Original line number Diff line number Diff line
@@ -343,8 +343,6 @@ static inline bool sendpages_ok(struct page *page, size_t len, size_t offset) 


int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,

		   size_t num, size_t len);

int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg,

			  struct kvec *vec, size_t num, size_t len);

int kernel_recvmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec,

		   size_t num, size_t len, int flags);

net/socket.c

+0 −28
Original line number Diff line number Diff line
@@ -776,34 +776,6 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg, 
}

EXPORT_SYMBOL(kernel_sendmsg);



/**

 *	kernel_sendmsg_locked - send a message through @sock (kernel-space)

 *	@sk: sock

 *	@msg: message header

 *	@vec: output s/g array

 *	@num: output s/g array length

 *	@size: total message data size

 *

 *	Builds the message data with @vec and sends it through @sock.

 *	Returns the number of bytes sent, or an error code.

 *	Caller must hold @sk.

 */



int kernel_sendmsg_locked(struct sock *sk, struct msghdr *msg,

			  struct kvec *vec, size_t num, size_t size)

{

	struct socket *sock = sk->sk_socket;

	const struct proto_ops *ops = READ_ONCE(sock->ops);



	if (!ops->sendmsg_locked)

		return sock_no_sendmsg_locked(sk, msg, size);



	iov_iter_kvec(&msg->msg_iter, ITER_SOURCE, vec, num, size);



	return ops->sendmsg_locked(sk, msg, msg_data_left(msg));

}

EXPORT_SYMBOL(kernel_sendmsg_locked);



static bool skb_is_err_queue(const struct sk_buff *skb)

{

	/* pkt_type of skbs enqueued on the error queue are set to