From nobody Thu Feb 27 21:16:22 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 4Z3kfb0696z59XY4; Thu, 27 Feb 2025 21:16:23 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3kfZ6fnKz47gf; Thu, 27 Feb 2025 21:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740690982; 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=8pe/0qsDJNAJbdlp2vZHp9kfpzwoxYcNoomLMsg9g/I=; b=Z8ez9cRbiSvRWwFqD6QsXBDLTHPgAVJbpPNvPOxML6kmLBC9ZEmp5hR6QKiZTrzwiVdXFU hYSL5pVOhcE9CTmfGm0p3+kjpCDG8l3iKhgsWoX1qGvkwBXYA/xMCT/AO1QDUAcA/11uJK 8hfUAKskeQjEgTTWnSPa/vDsYzUNyiDgUnxNbVvm15NNkkLJ8Y5bk/+ebReGITdcH0vPi8 tRvcqiWOOq1EGlILqPrM+06HxVpnM5V16tQuv2K8gtzfreTp6bRBg4eyuWaLq/QHa/kxVt TkUlUmXLGit6GBiECq6yhKcnzMIcbcoLx48Y5nbVFktt/+eqjOpvPBKcGL86xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740690982; a=rsa-sha256; cv=none; b=hSE+xJp+HIXTRTrKAje/e2z4PkO9Kv9KLWXXuXd+9WE7gIAbFwm9nBDeBgwmvKKhD2wrNi dzReQs84hFJz037oXDIrBd59kyqy8CkBowQ9SMVgLp9HqcDCPlwUG+fMAKVqiJMKqVFn4+ /tgLTh+vinDy737XTMovtOWLxmAcjom0TNV3BZduU0FT1XVZKSul/NkxFKmjFdtG+Vwk32 LiphFfPRXcFSuexjY1z0Tah/6bWaGCmrs/FeR/qPG1aigYMLc8x+YKLSHZSUp8Us1T47w/ T5iOR7eQVySJiy0F54ZnHAygwFldq0FHlzKpcd2E2aMAPejp1+ee44FqhUHz3A== 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=1740690982; 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=8pe/0qsDJNAJbdlp2vZHp9kfpzwoxYcNoomLMsg9g/I=; b=BpSDRbb/2i9H3Q0mKIJpD+am4sdoOEQCcKjcq8N4X3tO33PNJG41bW1jPv/HmrmSKnWfW9 m7rqaF39KZ403XBVCkNDL7NpT0xX7YfTCF+kATQpz/huUXZU+PLv7oHmiqefs4IO1yVoCR LqUPhyr8O9JjiUxQ1bnSxEdfG7UDvVdofkvDd5R47yuFDGu4sUQKn4KxZ+Ho6KHe4zUn6H lrkMvZkBLcJCaM6+sDs18zOmBkXA6Z/5+xcQt3Gtsn4AY9zYdQ8IKKlE5+3CHlgmVOsS// uF7BKNuaBvKlrkbxO5jBa1kQWa0cbstN7+oYhLLcc4iiMubuQbCn4y54TlEEOA== 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 4Z3kfZ62QXz10Hj; Thu, 27 Feb 2025 21:16:22 +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 51RLGME6005409; Thu, 27 Feb 2025 21:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RLGMpU005406; Thu, 27 Feb 2025 21:16:22 GMT (envelope-from git) Date: Thu, 27 Feb 2025 21:16:22 GMT Message-Id: <202502272116.51RLGMpU005406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 9e0ef670d8a8 - stable/14 - queue: Fix STAILQ_ASSERT_EMPTY() 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e0ef670d8a864d161a14cf374add713a659c3cd Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9e0ef670d8a864d161a14cf374add713a659c3cd commit 9e0ef670d8a864d161a14cf374add713a659c3cd Author: Olivier Certner AuthorDate: 2025-02-27 20:59:41 +0000 Commit: Olivier Certner CommitDate: 2025-02-27 21:15:40 +0000 queue: Fix STAILQ_ASSERT_EMPTY() The 'while' part corresponding to the 'do' was missing. Did not notice the problem as later commits using it have been stashed and never reworked up to now, and it is currently unused in the tree. While here, fix spacing after the '#define' in the !(_KERNEL && INVARIANS) part. Fixes: 34740937f7a4 ("queue: New debug macros for STAILQ") MFC after: 1 minute Sponsored by: The FreeBSD Foundation (cherry picked from commit d3c4b002d1fd54ac69c1714e208051867ee56dc4) --- sys/sys/queue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/queue.h b/sys/sys/queue.h index be862c7ce814..38c319704cc4 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -357,7 +357,7 @@ struct { \ #define STAILQ_ASSERT_EMPTY(head) do { \ if (!STAILQ_EMPTY((head))) \ panic("stailq %p is not empty", (head)); \ -} +} while (0) /* * QMD_STAILQ_CHECK_TAIL(STAILQ_HEAD *head) @@ -371,7 +371,7 @@ struct { \ } while (0) #else #define QMD_STAILQ_CHECK_EMPTY(head) -#define STAILQ_ASSERT_EMPTY(head) +#define STAILQ_ASSERT_EMPTY(head) #define QMD_STAILQ_CHECK_TAIL(head) #endif /* (_KERNEL && INVARIANTS) */