From nobody Mon Feb 03 06:41:32 2025 X-Original-To: dev-commits-src-all@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 4YmcND509gz5mbp1; Mon, 03 Feb 2025 06:41:32 +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 4YmcND2dQ5z41qW; Mon, 03 Feb 2025 06:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738564892; 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=jl71bIeMDplxJMMV4DBEefASe/NDwD1kfcCEuwHBDP0=; b=ctL87d0B/jNb3CcADNQ1pZAxdRMuEIcvZqeVDT8TI0iOuKEnlGTMSvqPxUH7UAaIOau6qV HfTocJ8BFMqKEHliCQo6FjYLVcVkKC+92FDk7XrqRuRJDG8KQ3ghDSIeSDFrol9SXXrXSe /J4Vdfv38N25VcyRElteDWLaKWPMaLfCeo/JF/7uKBuSBu/OVbN9i1TKx7G3mAZFBfxZYl fuUqwnLBqL3ZZWXAdqetp2yfMGXd3hBCUwmqSMQe+BC8XcuFsL965agqP0/kYEN4da0qVN 0NaoRI2jZCEgsyyS7TVNcsLP7EJ6jrfvUf176CZ2aIaWhnDE0h90bJXSoCVHZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738564892; 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=jl71bIeMDplxJMMV4DBEefASe/NDwD1kfcCEuwHBDP0=; b=HPTrVfaHclrY7cIm/WKnt7e8+xKM7llEh0bakoCiyH2pGOa/eo6ioWdge3oOJeiTss1x6/ URzI2Bs5FXzp+40ZH/jTQOUiR50F90wqC2aFklP8FslrnokDsvSOvJrewIlqpgnu8JppJf 32mLyHTDn8dQUht3SUlI5QvF3gj+bM6fo0nFahG8kQDeX5I3Had2TKxrnnWXKXwFFjPCzZ LhCt6UdiDaw8vVPHjOZo3N1CoiH3x69RjnWKf6wXoEEXCsMEYwIZJyXj9B2jI3/SV8ghLz YAo3olO/DuRv7wSu82fVPfgOm/sipGbtiuT7sGabUvch8nlsQZPYGAiE7myewQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738564892; a=rsa-sha256; cv=none; b=DRpm8wPP34LgcwTFrhsrDcb7tWkvqo8wZRw1FhcClW1ue9mIfJxk5cQFP1PQJ5qxRF3YoD b+aI0BAGHUr7GxwK33TAVG+JFkpgg1x7+O67sHJ415s8K5tGbOAUDy7UZ+dYOHpuyDpKMa gaAlFsKc6nR++T0fdW2L2/pDpfGaKyA5aYki13uV+AsQpFs8tk9fe+S08dHi08e+aHKs30 Ds8l9oyB4O3IKazWK8Mx8BEINkYIWGVyrIQLkJAX5OVcPEoa8fs/tyRwq1dCct+Hs/+sYE xzWw3D1jp7H9h1kBtFMD846PTI/4mP72nDb/P6bfWWHunGPp/H3WS+JvPW8K1A== 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 4YmcND2Dslz999; Mon, 03 Feb 2025 06:41:32 +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 5136fWQw057287; Mon, 3 Feb 2025 06:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5136fW7q057262; Mon, 3 Feb 2025 06:41:32 GMT (envelope-from git) Date: Mon, 3 Feb 2025 06:41:32 GMT Message-Id: <202502030641.5136fW7q057262@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: 815f2a61bfa4 - main - sockets: removed unused argument from sopoll() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 815f2a61bfa43bf46d79b34f081e2fac1dca1d3d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=815f2a61bfa43bf46d79b34f081e2fac1dca1d3d commit 815f2a61bfa43bf46d79b34f081e2fac1dca1d3d Author: Gleb Smirnoff AuthorDate: 2025-02-03 05:36:17 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-03 06:38:24 +0000 sockets: removed unused argument from sopoll() --- sys/kern/sys_generic.c | 2 +- sys/kern/sys_socket.c | 2 +- sys/kern/uipc_domain.c | 3 +-- sys/kern/uipc_socket.c | 8 +++----- sys/sys/protosw.h | 3 +-- sys/sys/socketvar.h | 6 ++---- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 6fc7d5d2eefa..a3722d771573 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1817,7 +1817,7 @@ selsocket(struct socket *so, int events, struct timeval *tvp, struct thread *td) */ for (;;) { selfdalloc(td, NULL); - if (sopoll(so, events, NULL, td) != 0) { + if (sopoll(so, events, td) != 0) { error = 0; break; } diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 9011aa31c44f..ec9fd615685b 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, fp->f_cred, td)); + return (sopoll(so, events, td)); } static int diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index c5296f12ba94..0d3c622fa9c0 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -177,8 +177,7 @@ pr_soreceive_notsupp(struct socket *so, struct sockaddr **paddr, } static int -pr_sopoll_notsupp(struct socket *so, int events, struct ucred *cred, - struct thread *td) +pr_sopoll_notsupp(struct socket *so, int events, struct thread *td) { return (EOPNOTSUPP); } diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 46a7053f2872..accd63642024 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -4405,20 +4405,18 @@ sohasoutofband(struct socket *so) } int -sopoll(struct socket *so, int events, struct ucred *active_cred, - struct thread *td) +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, active_cred, td)); + return (so->so_proto->pr_sopoll(so, events, td)); } int -sopoll_generic(struct socket *so, int events, struct ucred *active_cred, - struct thread *td) +sopoll_generic(struct socket *so, int events, struct thread *td) { int revents; diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index f9d7e1c4bb69..941d377b1549 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -93,8 +93,7 @@ typedef int pr_sosend_t(struct socket *, struct sockaddr *, struct uio *, struct mbuf *, struct mbuf *, int, struct thread *); typedef int pr_soreceive_t(struct socket *, struct sockaddr **, struct uio *, struct mbuf **, struct mbuf **, int *); -typedef int pr_sopoll_t(struct socket *, int, struct ucred *, - struct thread *); +typedef int pr_sopoll_t(struct socket *, int, struct thread *); typedef void pr_sosetlabel_t(struct socket *); typedef void pr_close_t(struct socket *); typedef int pr_bindat_t(int, struct socket *, struct sockaddr *, diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index e818fd3fc757..57209ea5557f 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -525,10 +525,8 @@ struct socket * sonewconn(struct socket *head, int connstatus); struct socket * sopeeloff(struct socket *); -int sopoll(struct socket *so, int events, struct ucred *active_cred, - struct thread *td); -int sopoll_generic(struct socket *so, int events, - struct ucred *active_cred, struct thread *td); +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); int soreceive_stream(struct socket *so, struct sockaddr **paddr,