From nobody Fri Apr 10 14:35:02 2026 X-Original-To: dev-commits-src-main@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 4fsfTf5dmzz6YpRv for ; Fri, 10 Apr 2026 14:35:02 +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 4fsfTf3bVcz3Xyq for ; Fri, 10 Apr 2026 14:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775831702; 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=0jrev8GBr5soo1qqJMSP+8q3mQz9IcAMsa2OmA3yX7I=; b=V+JMDWcqmTzDxh9yPJYfcTxlMCQbmYNchywZLs6nCO3ODUBicSdAXnm84qKr66JpDECzqN DZxPbC2qdShMNosOATP5Z2jr5/a4AEH9RXDAupAQNhbZSQiNV4BANcKkzB7z/0ia0tL5rF IPeQEbeYXJip6MY1DDwBnmS7a3RYmSJu7b/GAvO8E0iN9Oe9r91QosGhXLJCN1INOBOi0w TMlWJO1IiVjxxOVXfCIM+Sn+wlvxdSv/qHRELA68wjfVXnFuWa6medUynrwbnzQ6TtTOqe xMUAI3qZxUKTh6moGndMREjFyHm3MezHwwP5/U40vJeo9O7ISEHYs5EkMofWfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775831702; a=rsa-sha256; cv=none; b=W30+2iFPXzjW2JkSVLiehlOlaOWlQRbm6lQ+JgshRHo8yVO4o+Sn0bnsbfTnTBIcLgHpuA CyfGI+PTKYoIePr0NZ+JoiVBNMd9vjvHSkov3tZH2TzsPzentVZEP/cpWCMFbQ8DS+1BcR JQo7YHQZfGiXagzv5NAhKKYiaxT/XUXflTB+Qgj9WhtEbdsnMG++tlWFtL7SQwu0dqSpjw /Vvp5Il7ZkGn6uldgUP+DvyEg6G4thVCmyfNnmtcG/sakN8XcsmSo46C7JZPAlKcce3t2Y +XQWe86VqZD2MoqQ4roD3Fb71e92tcASkBoPGLtUO/lKjFZ5Q9FUspVcLmWTpw== 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=1775831702; 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=0jrev8GBr5soo1qqJMSP+8q3mQz9IcAMsa2OmA3yX7I=; b=li1oP+kobyCG/C2d24EvMTMPUqiWc0bqfA9DsLpK6cV/3pmEVWHyuKJA7V5a17nj4KkUKq IFjFpEhjc2q2kKx7OXME+AId19BciIeM3kmEb716wV4QBBn9GzM1pNDYr07H9dX3EhcDP3 ac2NnYKJSWtbIcrGeEvH6FYdQ2XKCdFAjugmgwp0zP4YNHqQ2Bil+NDO8OzHelWrGCV58N 9ob7T/WdB+sXm1H7S38AbVR26wZkSC+kY+a8mt32D625m3MWb7Be8fuh5u0XML3t5Nqzp1 MwtJpuSuGDb7blQi+ylJD2iAqOswCphJDjtUYBNmaAGn+/gGdSRqZswcCsJOlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fsfTf2Wq8zpDB for ; Fri, 10 Apr 2026 14:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f72f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Apr 2026 14:35:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 31069fdbdae1 - main - kevent: do not check knote lists being empty before removing a knote List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 31069fdbdae1027a6f1af7d56d418de4428ac6d9 Auto-Submitted: auto-generated Date: Fri, 10 Apr 2026 14:35:02 +0000 Message-Id: <69d90a96.3f72f.1ffef689@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=31069fdbdae1027a6f1af7d56d418de4428ac6d9 commit 31069fdbdae1027a6f1af7d56d418de4428ac6d9 Author: Konstantin Belousov AuthorDate: 2026-04-10 08:27:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-04-10 14:34:48 +0000 kevent: do not check knote lists being empty before removing a knote If a knote belongs to the list, there is no reason to check for the list emptiness. On the other hand, if the knote does not belong to the list, then checking for emptiness is not enough since there might be a different knote there. Reviewed bu: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56341 --- 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); }