From nobody Fri Apr 17 00:42:45 2026 X-Original-To: dev-commits-src-branches@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 4fxbh558qFz6b0Pb for ; Fri, 17 Apr 2026 00:42:45 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxbh54GBXz3f3s for ; Fri, 17 Apr 2026 00:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386565; 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=XvE5eVCeJoBqH6laUdMfw4fBm6FAtytaeFETXFnPzMc=; b=rMTTOl930N2t1CjnCMmWXGMX6Q3yZZ1fGp5rxaUghFulxir0vorLafWEVJbR+A5XX9Q+v+ YY3sdydg9UEzF4Y54yRoc9j/A29EAOG/UzjAuDOeLVWVAiqQjhHru5dQ3cTRrA3auNAcFf iMyXNC6R4TVtOkontUjR6jsbaqUTtqxUKDq9QRR49bfbDBjAlO/q0T0HBu9X2SuXC1CMBR 8a82ZlaDXgEyMjyBSjtdugYQaJI+IK8sAqwlMMM+5IWELOKQegPbB/TlV+rxsCFl0GPsrw 4o1LCaQ0vkb3OjiWM/sAx1oPc+MK1O6SpYXhZgSGwg1xDxxDTX2bK15tXIxrBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776386565; a=rsa-sha256; cv=none; b=hpN8dvLbeexjdiQKDZaLWJrvdYy5sWTGGan3kjsZsAFehJtQh/dNX0GtMkFPYgYUDqDiGG 1AEZn4lgC/TUqW7HwnzS441Jua7fD+YaRufbLHyWALWUWCSfvIsY7KNjSqztoIuVHAGJ4z ZZ9JBZ2nmlslgxjdE9OqxuSJxXzggQz85kEzUGYNXwJlzbpNp1gJzIrdPFeHcyAOpCwdqb ebhjC3QPaXNKLpnb9jlrqFr+8EBJF/f1Yw3DvQ05w2/CufCALY8sgBk0TX5FPiizpv15fA 3vk8+oDcVSXDH2xmORPAH5+zoABb5SX4LEHsQxuY3+SjoUEab5gs48DlzPfbqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776386565; 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=XvE5eVCeJoBqH6laUdMfw4fBm6FAtytaeFETXFnPzMc=; b=OjtHieJrmC4YBrPo47Pp0GnXvuG0NOx+Kwf2eIGatb05paBjKhDzJUvh9oh4H+I/Ais74q nJsGyutk/7exYVJpDFC459Lqv3KHceDfOuF4GJrxmux+j+n/Ay35wB0F4fOparwdvSDfKJ K0DRkFYOUHvg8lrhS4J9AXOys/3u1Ojwnk5YXTh/sL3pn1MKOPRUtZgpS2ZWLEqHGRlcxN 5xpW4xdPDnsjYUQrAxuIRVimnrVUFbOi+kHO7wcmRJyRRlQpj+Pu/Ul1W3go88W5M5E8PQ 8zwnl5fNSnS7/lb5da4V5R+EzdPjOuvOpV3VD689Uceu35KqyogK9cEEmFTpFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxbh53lF1zXQF for ; Fri, 17 Apr 2026 00:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 420a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 00:42:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 090c9ea98d32 - stable/15 - kevent: do not check knote lists being empty before removing a knote List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 090c9ea98d320bc3fa7794d4f668c44ff6902117 Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 00:42:45 +0000 Message-Id: <69e18205.420a4.7e019a1c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=090c9ea98d320bc3fa7794d4f668c44ff6902117 commit 090c9ea98d320bc3fa7794d4f668c44ff6902117 Author: Konstantin Belousov AuthorDate: 2026-04-10 08:27:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-17 00:42:38 +0000 kevent: do not check knote lists being empty before removing a knote (cherry picked from commit 31069fdbdae1027a6f1af7d56d418de4428ac6d9) --- sys/kern/kern_event.c | 3 +-- sys/kern/vfs_aio.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 01731ca46b6b..8c7a0949f024 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2953,8 +2953,7 @@ knote_drop_detached(struct knote *kn, struct thread *td) else list = &kq->kq_knhash[KN_HASH(kn->kn_id, kq->kq_knhashmask)]; - if (!SLIST_EMPTY(list)) - SLIST_REMOVE(list, kn, knote, kn_link); + SLIST_REMOVE(list, kn, knote, kn_link); if (kn->kn_status & KN_QUEUED) knote_dequeue(kn); KQ_UNLOCK_FLUX(kq); diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 2a790237d30e..da0e36fc1ec5 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2668,8 +2668,7 @@ filt_aiodetach(struct knote *kn) knl = &kn->kn_ptr.p_aio->klist; knl->kl_lock(knl->kl_lockarg); - if (!knlist_empty(knl)) - knlist_remove(knl, kn, 1); + knlist_remove(knl, kn, 1); knl->kl_unlock(knl->kl_lockarg); } @@ -2718,8 +2717,7 @@ filt_liodetach(struct knote *kn) knl = &kn->kn_ptr.p_lio->klist; knl->kl_lock(knl->kl_lockarg); - if (!knlist_empty(knl)) - knlist_remove(knl, kn, 1); + knlist_remove(knl, kn, 1); knl->kl_unlock(knl->kl_lockarg); }