From nobody Tue May 19 14:08:59 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 4gKc3c193dz6fFvN for ; Tue, 19 May 2026 14:09:00 +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 4gKc3b5RTcz3hKV for ; Tue, 19 May 2026 14:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199739; 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=vT8LqfzLAKtJlHLMpUEWkpGaQQWjGQDLN6FVVzsSAvY=; b=pngbH2UQ5DXGSoRiBZjT27gEoO9NLyZlhadSCXU1C/xc3IhxTb1CANtdhWHkBRo+Rt7hFM XWLUFmIYwS3AvTpV4+VO1A2TlYbkm6TeYGKtTCWC7yIBa2fwLPtGsCARHvH3u2m1MGx/hE UTPvKwH8vM327UKWY+u933G70tBG9dGMZpOdHqPaRx7Syk0R7vwT1mprN8A7/WpvFHW8FU zJYpX12htbibZXz94uN5/cYDugOqKMG+MshOn7fn8/C8GgeZC1qGJ6a2HfSSbeLy73f3XZ w5VDsELPFmNpzsmNjZyRF9PDK/e3Wja+BXFiqzRpc7tSgjWLkzPAmpXu4kubAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199739; a=rsa-sha256; cv=none; b=RuWV9DDPWOmyN0RqRnVKufuCxrD9Lcdf5Br5/qqkgwMT/vlgc/XMxmfHz0FFg8vecwF5dF RBrOv5+qVaziwPOcYO5kiHTYQkMGLBqJrVmVuZkDzKf7mhWoA/KP83qSrneijvAxrrtwTm ob7TXGVxjmKP1NGer9GGlN6vp4+6EvMLxF7+X+Anv0TdrrlRQgT/Nb1knxktk5ecsyLP3W 7f64f+NswZgg2r15i4TwbASGxaumwy8nDBbi5wu+tcIEv9lNnPmf4gn1kN5kP2pbMr35Mp qI9MAPp58pgzi9tsSBOYD1/qiJD/tcO4x/sP4OVqNIUh5EzndPTGWQWlw8PpQg== 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=1779199739; 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=vT8LqfzLAKtJlHLMpUEWkpGaQQWjGQDLN6FVVzsSAvY=; b=G6Z/AzCjXZXhowPUDOLIKm8coHoD/fg17mF/bHVIs5QyLe36IlX+gjmHqE+PmP5voWn+7d JUNlXh1m3Bmc06E8gPO2T8093pxWMVA063qVHOEsIRiUuvbAmB3bei31sPZDCOuQpw/byS TsZReWwBxxrxYxN1Bhf+bOwgJkaejv/wCedYgajRwI7PyeJ7ukmTekyQMJ/bSZCpzwJL6N 268DXgtZigUVHuXivo8FN6D6ud31REgQ8EsMlKs/Ksdr1S1Cjcll1/90+362YcKdQ20W90 9ijQvdLx0PKZnRUoMmOi1eUYzVgD2rccYFt8xb8eDgYGpMww1rvar79/BEZp2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKc3b4zq5z3TH for ; Tue, 19 May 2026 14:08:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be8d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:08:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e2053ee82d2c - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: e2053ee82d2c90471384dab765d0679c90233ddb Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:08:59 +0000 Message-Id: <6a0c6efb.3be8d.3f3e0a1a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e2053ee82d2c90471384dab765d0679c90233ddb commit e2053ee82d2c90471384dab765d0679c90233ddb Author: Mark Johnston AuthorDate: 2026-05-12 17:47:11 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 14:08:33 +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 (cherry picked from commit 3cd3900b690d8296094921cec844da3f72d30cbb) --- 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