Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 1 Nov 2025 00:45:06 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f9dfc0023528 - stable/15 - kern/kern_event.c: extract kqueue_acquire_ref() from kqueue_acquire()
Message-ID:  <202511010045.5A10j6tP000810@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/15 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=f9dfc0023528cfd743490caf6c45318f076783ea

commit f9dfc0023528cfd743490caf6c45318f076783ea
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-08-19 04:54:27 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511010045.5A10j6tP000810>