From nobody Tue May 12 20:06:05 2026 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 4gFSJt1nsnz6d1mt for ; Tue, 12 May 2026 20:06:06 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJs6Ghgz3ZXq for ; Tue, 12 May 2026 20:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616365; 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=uySVV8oc08REFXhhXo1OGjhTLcSHSmRnCL6GQYvWwtE=; b=hgPtjvXPYU9SF9BLuUYGNsLygTZ3MPSxihSO/wl76t5ZPAUyc+CkXNRLk5xlXG/3bUqatl xmrFiiLpaRP3lYIWiIDuXwTFXyXHwfA19ORkMoB4YugjIPzxVGU5fqJEFKEwvcb5f/sTls QM1WGfPy2DgzvD6sh6Zxeg0X7URZJSZdPaUJI7osodb/EPG3fJ2JMLg+VbWIomOr9gq86J YpxZU+BszplhMtT8au5U2GLHZAKiz7ASS9a5xyKSp6lx+9BZLvh6cLrgWshchLXMoOHaxZ Az1xI8AJf6H+1yGD+eF92LxN5p6qtDi2RKBVW6dBaTjkN1UiGhmyOBQAbQ4z8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616365; a=rsa-sha256; cv=none; b=i9UVF3B4GkA1hldmApQLf0ebTJBSfhQFnlaeNplMD7vyknGJAhdwlzzZ0fruQPTI1BXESi 1E5egXtqPJNa48yhEjRGmRTRemzlIzNgghECoSBQO+6bKgQNHxreNg58re5og03yCCBi8P m1HQL7aWFvgJ+SxkfvH8AaeMvz4MqiITLsTIYHwqLMGHsfVQ9pzQb0gCVzM4FL0IEMCftO HRr3IZCSz7khTfZsEfpCfUrzGNItpcvDdibjTz/pMh9pFp8+UTcDBtRdLJBfpqM04ZNCxE AJWvh7w9w3+cR+BS9EuuAO5b6jTxGcz/kl4M5Y8pRGPK4HxiKfHF1It6whoXXg== 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=1778616365; 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=uySVV8oc08REFXhhXo1OGjhTLcSHSmRnCL6GQYvWwtE=; b=aHnyBQNmkGY8ncXny7gE7w83/aKb2gP7ATH2HBhz8zVAUwLugOPy9y7G5r8jPnlPj0xDBh /7pZIOJ8Pji6s2PSylNUOVaMn1pfbTs+7rCN20P064J9OU/yklI7eXvQ8+7Xt4fwKYRzwZ ZZA8lPyJFjes/c1RraF8fuNliFH1qy/ULAC1qDhgS+xdkzisAnv0s0/QbENxqipAz2EpjT zhrW0jTrZPL1tpUGbm9IG3OEssHCmOVqAA3rUryByPPd1aq5VUVEQqZZK8iW6BIfcPazJv x/lyziIHFg6ebJtWlYK5l9bM3EB1Us4x7xNa0WI3chQGop/Wvv+vEOoc2GkQ1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJs5pxrz3ZM for ; Tue, 12 May 2026 20:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3cd3900b690d - main - fsck_ffs: Avoid relying on param.h pollution from libufs.h 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cd3900b690d8296094921cec844da3f72d30cbb Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:05 +0000 Message-Id: <6a03882d.22d60.75b6446@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3cd3900b690d8296094921cec844da3f72d30cbb commit 3cd3900b690d8296094921cec844da3f72d30cbb Author: Mark Johnston AuthorDate: 2026-05-12 17:47:11 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 fsck_ffs: Avoid relying on param.h pollution from libufs.h - gjournal.c needs param.h to get a definition of isclr(). - fsck.h needs signal.h for sig_atomic_t. Sort includes while here. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56858 --- sbin/fsck_ffs/fsck.h | 9 +++++---- sbin/fsck_ffs/gjournal.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index aaf02850f29a..ff2ac6305be2 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -62,13 +62,14 @@ #ifndef _FSCK_H_ #define _FSCK_H_ -#include -#include +#include + +#include #include +#include +#include #include -#include - #define MAXDUP 10 /* limit on dup blks (per inode) */ #define MAXBAD 10 /* limit on bad blks (per inode) */ #define MINBUFS 100 /* minimum number of buffers required */ diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c index b94f27758315..edbb2f373815 100644 --- a/sbin/fsck_ffs/gjournal.c +++ b/sbin/fsck_ffs/gjournal.c @@ -53,10 +53,10 @@ * SUCH DAMAGE. */ -#include -#include +#include #include #include +#include #include "fsck.h" void