From nobody Sat Oct 18 05:14:13 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 4cpVGt0cjLz6CQJt; Sat, 18 Oct 2025 05:14:14 +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 4cpVGs2K3Xz3TpJ; Sat, 18 Oct 2025 05:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760764453; 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=Cq7/rO9gVrNkXxIKFFf3jA13ZLhJvMPHVwBsNeFRDUs=; b=WBaKMcU2MfjllKEHenpe0ohhsGGJnzR6ClvXwRicZJzDOynbTNhwhaICLo69gsuTvpFeCU X+rW0sumk1AEUEXUl8TVBdtFV/ZG/WvqmwfEHFgZr5AKs0D48IZNlFQnG91z6diYE91Rk2 E8p/6rbb+iSinCMt/IPXFPnkWKpdcuH7J+ckGFRMyJzV+qROe3g9yywp0moxiZRSVa6D0l KtrTYNbMQOGXk0uAgGLmFHHj87/Ja0t3CpejRr1UOp1c7F/S2bbQnZe41ZZoeSQlpM8Qdm LbGSikGjWMNN4IuRVQnomDtfBlBuM0dZluUNJLE1I5XQGPyo+OLCrKtepvSF4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760764453; 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=Cq7/rO9gVrNkXxIKFFf3jA13ZLhJvMPHVwBsNeFRDUs=; b=hheXb2UeXVMiG7VoYC4adkBMqGyzO5JzdXoEL/72R09UcAlxZMF1gcviofT+b4ilhALDfU eo6FcgFmnSIqQeM7e9r8BDz8wJZhV557uNHNpT50bFavM47eVhyL/FphHKqpXTRlfYN31w 9WTQ5smA9AnSqu6yGBNP/skuCJEXwzW0y9CcxdfCoj5YM5++iI1HNoFB9FKx7qjhj2kv6X Rjg8wEu2SZbLfrI1ro7Rz+u5vjbGQbICsF4Dp8TJzECkWGG1JiTwJSToXrsWG3wZWLugo/ Voqe31qdIOqcAy2M9NQpTxAIA45GLCAxOETJ8UBJ8wh/DBJa0n6KeBraJSyw/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760764453; a=rsa-sha256; cv=none; b=EFg1LEG/VlGjEy2YUz1wAmmCE4KtQoBt5Qk3UztRK1AfDPyPypKL/aCIzR8mHvZ74jzCYn xrfeX8LR9olcJgd/l8KrGApwakY1ANlKZUxAdEunxbcAaYEZT5wHrBy9x+RUu1CV59HWzg 1mY+YbrKMRc0q9y08KvEapsiSIwizy65p3kq9Zkk/dES1ahx8Gdi4H/dKVStkhx9Hok1EO c5ygGBR3xM7TX3xItVda1wqpWKezvB0J2R+TzJTbirWxCUksyeKm0GtZ8sktopkb89Hl4G 8MePGSAgUZTM8TP51xQpWqaTUO5yfqAkHMAXHDB8xgeE0NIDfRxtIft430mNXQ== 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 4cpVGs1vWbzBrr; Sat, 18 Oct 2025 05:14:13 +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 59I5ED39062399; Sat, 18 Oct 2025 05:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59I5EDTH062396; Sat, 18 Oct 2025 05:14:13 GMT (envelope-from git) Date: Sat, 18 Oct 2025 05:14:13 GMT Message-Id: <202510180514.59I5EDTH062396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 25cecc4ba284 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 25cecc4ba284096376b1348a807c0e2704d1b746 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=25cecc4ba284096376b1348a807c0e2704d1b746 commit 25cecc4ba284096376b1348a807c0e2704d1b746 Author: Konstantin Belousov AuthorDate: 2025-08-19 04:54:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-18 05:12:36 +0000 kern/kern_event.c: extract kqueue_acquire_ref() from kqueue_acquire() Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D52045 --- 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 5435f9702d06..80c289f7d802 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