From nobody Mon Feb 3 06:41:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YmcNG15Tzz5mcCM; Mon, 03 Feb 2025 06:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmcNF4N2dz41QL; Mon, 03 Feb 2025 06:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738564893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kou/eh+JZFDakVKVbOoD7M0Lud5TPWTS2HpSKHZ/enU=; b=p15L9JJY6jfQc7izA7xvLXP7cdGYWKam2/0acxL2vHkmzy1wXU6t7uD0+88Lw1aAFgO94a NKXhmnhgjc571sCGFWCc/yoj3CsGoEY7LMrR6tRjrx/ZonYVfwzx/f/kDZHYn3S7C5b2nC M6jt+/563Raf404iqk/RMpHdB1qum7TPBJnwrO3zKdgzWTu+J3pWe9fz4iAYXmyrTer3Yh pzsHNuQxHstfD06Vfo9N0Igp3tazgmLRm8iV8tLrc3SxkmwXy0MVJ5lvn+DGEqgIDqn9Yu qlHC7eVLbDCKmUk0McZH2ttEyjt8cWpdPA9QTwvEVh15/IU7i3dMjDITKdgwjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738564893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kou/eh+JZFDakVKVbOoD7M0Lud5TPWTS2HpSKHZ/enU=; b=JkXiS4YY0WJDTSYg/Lf0dt3q/o9b+nnQR52UDGaIoMjf+Fxc98N3UcPP0b1qTAsUT1TF1F FXjtiMC8Y6F+NcqGIN7XFNkhWdQRodJLtoO30s74l3Wubak4VY3515Md6MCJoM+GI2ky7a 2EXhejf4/QCmbGfkf1h95lEvS8i3w8/6jQD9RaBuisdwV4+w+ezRWnpio6hDNCED6YDh4M jnK09yS1puf8AySuuzaCaUYV2t2AOQdZbiIWwwqgKrcltk9XocQYM7lXhaVO7+180xBx4E sVw9RY0Yx/oWLHDKnbxa4RvuvPK/SyFY0TP4lP+q/bxrNQGSmaLUY+h9jS8qig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738564893; a=rsa-sha256; cv=none; b=J9Cd74wRmYsZqYEf1uheH1I+vFQbuoz9kohJNW0dN+5zw4ZH4koWNE0zuCa4MnN4XGi+SY VDbTJbbzEJ5/ZmGB4d5XCB+emzcA6zmDU9zcWJ5NgvHGS1CUT+Y6enJ1yKI1DkXNMjQKtG qmEZEb9RqHLy3bBDJuhvSi7w62gxmLHa/RhWfxIyMSxeTgtvCvukBjq8Jr1IU/PAbxJ/Mv oMTUNsOtcq18xAbO1R/WbfkOSYmdzWZNT96iaHExJDHwx04B0EvNrzWCCZSXBtwUKGAU3c CBydWwux5pvXoaqjaCMd4FHEP9usf7uatak7RjfMQEXsuiudd+4s1XFPkwqIbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YmcNF3Csmz90s; Mon, 03 Feb 2025 06:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5136fXId058460; Mon, 3 Feb 2025 06:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5136fXhZ058457; Mon, 3 Feb 2025 06:41:33 GMT (envelope-from git) Date: Mon, 3 Feb 2025 06:41:33 GMT Message-Id: <202502030641.5136fXhZ058457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b0580c7a6742 - main - sockets: remove empty shim function sopoll() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0580c7a67423efb0c2bff7081ff9747d257c830 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b0580c7a67423efb0c2bff7081ff9747d257c830 commit b0580c7a67423efb0c2bff7081ff9747d257c830 Author: Gleb Smirnoff AuthorDate: 2025-02-03 05:46:13 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-03 06:38:28 +0000 sockets: remove empty shim function sopoll() --- sys/kern/sys_generic.c | 3 ++- sys/kern/sys_socket.c | 2 +- sys/kern/uipc_socket.c | 15 ++------------- sys/sys/socketvar.h | 1 - 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index a3722d771573..dd9c28e81388 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -1817,7 +1818,7 @@ selsocket(struct socket *so, int events, struct timeval *tvp, struct thread *td) */ for (;;) { selfdalloc(td, NULL); - if (sopoll(so, events, td) != 0) { + if (so->so_proto->pr_sopoll(so, events, td) != 0) { error = 0; break; } diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index ec9fd615685b..33cfd1637b78 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -288,7 +288,7 @@ soo_poll(struct file *fp, int events, struct ucred *active_cred, if (error) return (error); #endif - return (sopoll(so, events, td)); + return (so->so_proto->pr_sopoll(so, events, td)); } static int diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index accd63642024..c4ebb43eef18 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -96,8 +96,8 @@ * NOTE: With regard to VNETs the general rule is that callers do not set * curvnet. Exceptions to this rule include soabort(), sodisconnect(), * sofree(), sorele(), sonewconn() and sorflush(), which are usually called - * from a pre-set VNET context. sopoll() currently does not need a VNET - * context to be set. + * from a pre-set VNET context. sopoll_generic() currently does not need a + * VNET context to be set. */ #include @@ -4404,17 +4404,6 @@ sohasoutofband(struct socket *so) selwakeuppri(&so->so_rdsel, PSOCK); } -int -sopoll(struct socket *so, int events, struct thread *td) -{ - - /* - * We do not need to set or assert curvnet as long as everyone uses - * sopoll_generic(). - */ - return (so->so_proto->pr_sopoll(so, events, td)); -} - int sopoll_generic(struct socket *so, int events, struct thread *td) { diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 57209ea5557f..6e2eb64ea0b8 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -525,7 +525,6 @@ struct socket * sonewconn(struct socket *head, int connstatus); struct socket * sopeeloff(struct socket *); -int sopoll(struct socket *so, int events, struct thread *td); int sopoll_generic(struct socket *so, int events, struct thread *td); int soreceive(struct socket *so, struct sockaddr **paddr, struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, int *flagsp);