From nobody Thu Feb 27 23:34:53 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 4Z3nkQ42r6z5JqDJ; Thu, 27 Feb 2025 23:34:54 +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 4Z3nkP7194z45lY; Thu, 27 Feb 2025 23:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740699294; 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=SZkj+ufRR9pgRYCqXlyHz+hgGKpT8c/212P+ItlB7U0=; b=rEJEr/eSE9fSeba2D+tE6xOoF50lZi6XqEAKSvcMvPfAf5y+0M9TYfDEOhDyHvKwqrcGI9 aMZ9eGiW3XXNQ5YnkzLqoLmDTxPUAmfM1MQAx50a4DWp+G3RgKig6fOY1jQOMwfI1vi6M7 cLNId3lQ5itBgCvCmQS8dKbXgJR/P3rwJRFO27B+AKuZSaeH67kD4bZ3GNcx6vKR9tNGpu IJYxT3hrLXS9lVu0lSJkEqkkFONVyQqj3u6oAhyRCXdH6kP6s9ZPEqrh2QWzAwiNzyou9l m2m6xDlQV24VKIie0nN294CUuanueapN32e7d3+0ZIPHaVDX/8KOc32fasgyhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740699294; a=rsa-sha256; cv=none; b=qYIn9V1ucWewFMnT/u9jSrKs6/5nKT/dVRQmeQqTsaTjWzNBfZWkp9h/sd1YZ0r7tfHOQs 9z4fHt6atCTGVL43kpbtP5RwYnHG7E09X09PJ8Z/RgmHJwMUJTil3G7NAqO3dyhk5wukeH 10fsIPI6aNd8V+wyN0pssfMQnlC0vbaY5jEhsuHae6S5+HBUlgX51ypD1AYOLXfVfKgX1l MPjjnmaeJQmp/6HY65BFOqarfwNgOkCUZngTystInoeS028kLdrecvKCSM8OlCDVbQ3rgq w5xTNXWex7C5TwMPZXXIlj3sd1DEyJ5IwfI8Wm4lIgyIzSD6qZVrTxf3yYiR3Q== 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=1740699294; 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=SZkj+ufRR9pgRYCqXlyHz+hgGKpT8c/212P+ItlB7U0=; b=DFXTdsPQbkv9p82M+yDkeZO0e0bFjOCJSey5khmPlMvaw9iCj3xGdna9oY0xqVmlCw9f2P 2spC1ErxqCF5Q1Kl1L4HZ/vDSaA13DFdQ8nsferpBnRAwgJ71hECqaPWx7mBNc+104Ahb9 4rddce+a2kynlKOaMueeknpSy95aLV1t79tN4Q2PdOv73rXi+cfxDfNTiE37/9LXcJv6v5 FwTh59v1t58UALVNrADgL9glqDJZI/IT+IikBYdRBKPIyxKjV2N1xJUeEVC4+wC5dMcbbg 02BtIgY1DAOFh6YV9AAwzsjhR4prFl9QjJeAWGsp9qe1nbtQmymy9bbm03m//A== 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 4Z3nkP6VzJz13CK; Thu, 27 Feb 2025 23:34:53 +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 51RNYrTj065887; Thu, 27 Feb 2025 23:34:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RNYrWL065884; Thu, 27 Feb 2025 23:34:53 GMT (envelope-from git) Date: Thu, 27 Feb 2025 23:34:53 GMT Message-Id: <202502272334.51RNYrWL065884@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: cf411e5ed3a0 - releng/13.5 - 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: cf411e5ed3a0fdb9fb58866b98802f7f6d3597f1 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=cf411e5ed3a0fdb9fb58866b98802f7f6d3597f1 commit cf411e5ed3a0fdb9fb58866b98802f7f6d3597f1 Author: Olivier Certner AuthorDate: 2025-02-27 20:59:41 +0000 Commit: Olivier Certner CommitDate: 2025-02-27 23:33:27 +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) (cherry picked from commit 4fd887f08b000173c196e954b510752025ff3fc0) Approved by: re (cperciva) --- 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) */