From nobody Sat Nov 01 00:45:06 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 4cyzdt75Dbz6FWVv; Sat, 01 Nov 2025 00:45:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyzdt4947z3hJT; Sat, 01 Nov 2025 00:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761957906; 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=nh6MiK2Ud6uRq6FlJK2LpvohZ7bzigihBEqWvawhmRU=; b=eNIfxsFcGkmZ3szbQds6KV0LSiDePXqf0/aIqjXgz2Sd+eBvSNYpPXiiUmXyIKLiwNqeLU 8cAJgwMIFm+7eLKUM5V28T1FM9WgNkVNBPHp6FfcxiWY0n6X+di41BTRSxwjVz+mpC3ZU2 3/t1FEXPcRBzaoUhIHb5AaT3yVPVW4EQ/IfAvK/GgVmf04ylbK1/ximdezrMQ80nH1aVOa cSlmv5ndChrlEJesYX34757pPdyk2YAtIE3yPooT8vSVhNosMFZv8jrOREKQg24Us5VfMM KBrANQ14nuOJNIkFR5umwuj5aD2IRinyo9AVBtEt81cY9jUEFVR2sElUYe1yGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761957906; 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=nh6MiK2Ud6uRq6FlJK2LpvohZ7bzigihBEqWvawhmRU=; b=qaGmDEEzqtdumTKDxCxaN85ilXhE59e/F1vdfqWxXnxI61PKl25ni01CyH6hmoQhoJifIj 0zlehwTpGuMBoh8Voz6j/xZaJc+JvyviPMv3PVZkV13kFJ9uF2BIBXi8oDlU+hjmzyuAA1 kMXnKUqKZVoB//HR3VN/lGGn4LW86tQexlBCw+0er9laNcnHXL11xlUw+OhIazVnUL3sk+ y4ouC8KHmn5jZUbb65IfNpfa3cm8XDV0xVn7ISZHMEafPl9sLRmMuOPcb9TatHoPo+PVkj EWIhAt305OOqSv4qgxkbEPASIQN2reGhRnWePv4A1EFNZzA/W26KRQf2Q5dNAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761957906; a=rsa-sha256; cv=none; b=x3Buo2FMg9omm+9byMmyNkWkJM9HzFv1y88XwRa5SyavV2OdaDMbsXamUqJAPyQXlK3247 2jJIYFSs7kriaOQIrDA5JDK7gNoLM07NAi1K5hD28Ny/HQFfnrJ7NPCyalWVbaOLjumzBA w6Yxm+ieHSCE3zHCRRFKvb3Hd3hjPWQHlMqIqHjCHHH8ihKqUSTbmr1eIWXB2qvTmHAubW 6hZHFk62NlnjiKdxmrqZJkPaDQOqS2qYISzr6n0J+jbLZ2gjD6kzNld6BJ7RGVr3wSDX74 vENhiMGaMQK9yajqioyydDfD4WYk13zr0Ebx+62/gPL1Biwko42NMfhu3q4jDQ== 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 4cyzdt3JSWz1Kt; Sat, 01 Nov 2025 00:45:06 +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 5A10j6G6000813; Sat, 1 Nov 2025 00:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A10j6tP000810; Sat, 1 Nov 2025 00:45:06 GMT (envelope-from git) Date: Sat, 1 Nov 2025 00:45:06 GMT Message-Id: <202511010045.5A10j6tP000810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f9dfc0023528 - stable/15 - kern/kern_event.c: extract kqueue_acquire_ref() from kqueue_acquire() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f9dfc0023528cfd743490caf6c45318f076783ea Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f9dfc0023528cfd743490caf6c45318f076783ea commit f9dfc0023528cfd743490caf6c45318f076783ea Author: Konstantin Belousov AuthorDate: 2025-08-19 04:54:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-01 00:43:14 +0000 kern/kern_event.c: extract kqueue_acquire_ref() from kqueue_acquire() (cherry picked from commit 25cecc4ba284096376b1348a807c0e2704d1b746) --- sys/kern/kern_event.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 7552ac5ffc45..59d3e39aef93 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1871,17 +1871,8 @@ done: } static int -kqueue_acquire(struct file *fp, struct kqueue **kqp) +kqueue_acquire_ref(struct kqueue *kq) { - int error; - struct kqueue *kq; - - error = 0; - - kq = fp->f_data; - if (fp->f_type != DTYPE_KQUEUE || kq == NULL) - return (EINVAL); - *kqp = kq; KQ_LOCK(kq); if ((kq->kq_state & KQ_CLOSING) == KQ_CLOSING) { KQ_UNLOCK(kq); @@ -1889,8 +1880,22 @@ kqueue_acquire(struct file *fp, struct kqueue **kqp) } kq->kq_refcnt++; KQ_UNLOCK(kq); + return (0); +} - return error; +static int +kqueue_acquire(struct file *fp, struct kqueue **kqp) +{ + struct kqueue *kq; + int error; + + kq = fp->f_data; + if (fp->f_type != DTYPE_KQUEUE || kq == NULL) + return (EINVAL); + error = kqueue_acquire_ref(kq); + if (error == 0) + *kqp = kq; + return (error); } static void