vsock: fold sk_acceptq_added() into vsock_add_pending()

Move sk_acceptq_added() into vsock_add_pending() so callers cannot
forget it. vmci is the only transport using the pending list and
is updated accordingly.

Suggested-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Raf Dickson <rafdog35@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Luigi Leonardi <leonardi@redhat.com>
Reviewed-by: Bobby Eshleman <bobbyeshleman@meta.com>
Link: https://patch.msgid.link/20260612045216.105796-3-rafdog35@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 2a267283aef80440dc4ec2db04bb315aefb88cb6..cbb71aca6cf11711f9aa927da0158bf558e7676d 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -484,6 +484,7 @@ void vsock_add_pending(struct sock *listener, struct sock *pending)
        sock_hold(pending);
        sock_hold(listener);
        list_add_tail(&vpending->pending_links, &vlistener->pending_links);
+       sk_acceptq_added(listener);
 }
 EXPORT_SYMBOL_GPL(vsock_add_pending);
 

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index af64fd57c0c85deffb1aaa3e530ba1b58495c1d0..2d8efeb8afe233beb5e9aed9bcd4798e79dc3753 100644 (file)
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1109,7 +1109,6 @@ static int vmci_transport_recv_listen(struct sock *sk,
        }
 
        vsock_add_pending(sk, pending);
-       sk_acceptq_added(sk);
 
        pending->sk_state = TCP_SYN_SENT;
        vmci_trans(vpending)->produce_size =