From nobody Thu Feb 27 21:11:49 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 4Z3kYL37l2z59Wbc; Thu, 27 Feb 2025 21:11:50 +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 4Z3kYK74TKz45xr; Thu, 27 Feb 2025 21:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740690710; 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=OK6X8UmxkDgVUKbJqrmNv0is0JHvQAyeRWS6vPYyIfI=; b=VzST+2TJgUKKOif54Sr2viyHTxTgiau/0va6i7zF2yMjPAJPGMvzTBx3gexFKHaPMCdm4n OSvBRbgYi2cKXErF5bjyqrcoz+plavU8cNvqI2jgxLEl6hzWRABQL328CueQmxBy2cBXBB peTrYqn/tPu6Oep1t0vWKwcwfb4DPpK8MRC7W3FEVdoxbQk0AzGiC2RvnzTdxgDf0Qf5nu gBoE+PSabCpHfRL01jc1CUKJWdYc5TlMyCaJvAY63LadkE7agAAE/oGNebM9qtQTVvaCuF Q4To9l6AmTnEws2+KioTQdfKmNA4d+9vqaaH4YlJIdeUVROgCICsT8MSVlKBCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740690710; a=rsa-sha256; cv=none; b=TLIv/bdLX2eNSBO0/YuiORPgUB1sctuF8PMraKb4k3l8w5d1bE/BfW/O8aKAmlb13TNV0N L2ZOfPiOqj1Dc12/xKtM+E8cuFU3CD/koQovTtkGnyNOBqoJRLNfUTb3rB70aC64wVaQCa A4U1bfxqepb3Ql9J9j5AEyDXULK9iDJBTr6PcmZ7g3o6tsLLlKxRtFYv56e9HaXW1dRyOr X8h4JGR7KqmX0t+PP/oYNjdd6VeOslC1Au0KEM1+O98l9yHOi6GRjsnI8EAyAS9x5l1/yq S/QLdHIsT7SiKwyTux0qJEYJQvAyOT1ZKJnSK7MlN0zSAQz+8qgnf2kVpkISdw== 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=1740690710; 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=OK6X8UmxkDgVUKbJqrmNv0is0JHvQAyeRWS6vPYyIfI=; b=NvJ3XqMq4zurEzTHExrIsbJgNXV4si3+nrUkvf3K7bQbduIAa2xDJnxLKTYMKuyjonC96d D4dXGt/OY4z3KCPN1VuRLku/w6NAdMbSVNEXDPzM2ek/0cdR40Ulhi+xSyKaslRSVnQuZn 8yhPwbQyPd4vlzIX/QUrJKoJEnJF+QcLxYmmUwsj/q6tTxbx7T44KMzLBDdYP4QWBdmVjX s6xPsR9HT7o1m41Cw4XIgPXhwEtXqvGkvfs8wC5wnH3RG9v1gPbrjpbkHmR3Q8j0tmvcCU GZheZu2HQGU/8SeRLTfQ/dDCOFRzuIFrUGrj+b9KsG9uWLK4qUI0Gm9fVHk4XQ== 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 4Z3kYK6Z70z10K7; Thu, 27 Feb 2025 21:11:49 +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 51RLBnPG098614; Thu, 27 Feb 2025 21:11:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RLBna7098611; Thu, 27 Feb 2025 21:11:49 GMT (envelope-from git) Date: Thu, 27 Feb 2025 21:11:49 GMT Message-Id: <202502272111.51RLBna7098611@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: 4fd887f08b00 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 4fd887f08b000173c196e954b510752025ff3fc0 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4fd887f08b000173c196e954b510752025ff3fc0 commit 4fd887f08b000173c196e954b510752025ff3fc0 Author: Olivier Certner AuthorDate: 2025-02-27 20:59:41 +0000 Commit: Olivier Certner CommitDate: 2025-02-27 21:11:10 +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 0b1e1f9fba55..31a220bcdcc0 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -356,7 +356,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) @@ -370,7 +370,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) */