From nobody Sat Apr 4 08:59:42 2026 X-Original-To: dev-commits-src-branches@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 4fnqKV23ztz6YGgw for ; Sat, 04 Apr 2026 08:59:42 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fnqKV0yMVz3LJP for ; Sat, 04 Apr 2026 08:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775293182; 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=jE4evQBO/+idVt5lCFwh5zsDphGugzjox6jgiAR9Nt0=; b=kqIcrDvaM2nZqSRKfUm/JMEWndFLAosKzsDE/48sXt5LJT1bPsiRQQ+OxpqYud/0YrYLdn YetYOVhvc7ggTOf/mujKpqndzygvqvrGin8JI281kSoxGt3mF09zeCHcgzEV4p9zfiyRvb wd0g3ksgXyjycYLUqBUAG77zjYzHY5CkR3NzJUqlj6lpits4n2u6r/a/ZVV7l4LEvLZ74J YiTn8IlRiVv5TRR1JSVTOqwTL4GsuiCF8DT1tEC0DkKNPKwY3/XYU/c6fG2NLHoC4MUBod jr8hfmFtt/u2A3QscgWJJWBQLlV1vuReL1ojTFoeRXvCuLw2zEv/9rxfm6Pa7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775293182; a=rsa-sha256; cv=none; b=oLnK3KEXU1YbuC2K53ynkGxbnsFV+F/XZHP9c3Lj+4ljTvt5c44aUK5Q7LSARDAI4PshQg 5x3F0M1JXvWa9qaDq81Ij23xAZuxIJgR4Z21p3SYys4O3QdkbUgI6+maswS8orvdjKnByS 968sFLTtowXPkRSiiAuB1GgsDTOvsMU7vJN2H3y4Y8eJhn183ngvDxWZBA/2NzXyAhs/pi 4nEnHzmI4QavItocqNAl3Te8v/J5U3BRdKfpXUJHQDSnhVbOaJmNL6PIYzmsYUlWhZUddB VlgG8yAxcIGDRs1agX0tu39NtNFcU11oQkHGdK2aC7U9gXrlNDt1Qnt4Wd0qvQ== 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=1775293182; 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=jE4evQBO/+idVt5lCFwh5zsDphGugzjox6jgiAR9Nt0=; b=ifFEhyorm2A0jrulXzz7ZMsC9SeOcYIb9RJBoW74SRBwx+adwwRdPUtapkyErViK2xXbMp 9PLHyAU9+9CITUbWZ8tDopPLFngothuGlptNRJBtpBwtR5LWLXbfQKQ/cJca2C42+H/vv3 ZNSDknBPeI6wxTxTuXaa63gk3qwZ5B0xzNWrU69le0mAICZSET69wsy5/SZvT4sVgMh1mj IZ+J4rLZE4eWiMYc4vyeYY6M1A5JkgYdTLGp7/MsiFFLKGHtPx6IXWVFGtbVaqD8syNUtb 0WlrY4vkC/8lyYr/d1vV6xFRV7HiENH7yjLAChxg1i8H0GSENFGGFP/ELpTDxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fnqKV0LtBz1QRB for ; Sat, 04 Apr 2026 08:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 379a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 04 Apr 2026 08:59:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: e28c20959cd3 - stable/13 - tunefs: Don't combine GEOM journaling with SU List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e28c20959cd3aa526a6e86d8e9fe55fda326a951 Auto-Submitted: auto-generated Date: Sat, 04 Apr 2026 08:59:42 +0000 Message-Id: <69d0d2fe.379a9.d6716ca@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e28c20959cd3aa526a6e86d8e9fe55fda326a951 commit e28c20959cd3aa526a6e86d8e9fe55fda326a951 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-21 07:21:33 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-04 08:59:33 +0000 tunefs: Don't combine GEOM journaling with SU GEOM journaling shouldn't be used at the same time as soft updates, so don't enable one if the other is already in use. MFC after: 1 week PR: 293896 Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D56002 (cherry picked from commit b1f72dd2a9a5e69a310b9e76b55f16cff433b8da) --- sbin/tunefs/tunefs.8 | 8 ++++++-- sbin/tunefs/tunefs.c | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8 index 19059e335834..9624bab89ea3 100644 --- a/sbin/tunefs/tunefs.8 +++ b/sbin/tunefs/tunefs.8 @@ -27,7 +27,7 @@ .\" .\" @(#)tunefs.8 8.2 (Berkeley) 12/11/93 .\" -.Dd November 17, 2023 +.Dd March 20, 2026 .Dt TUNEFS 8 .Os .Sh NAME @@ -94,6 +94,8 @@ this parameter should be set higher. Specify the expected average file size. .It Fl j Cm enable | disable Turn on/off soft updates journaling. +Enabling soft updates journaling implies enabling soft updates and is +incompatible with GEOM journaling. .Pp Enabling journaling reduces the time spent by .Xr fsck_ffs 8 @@ -130,7 +132,8 @@ is running. Running a full fsck on a UFS filesystem is the equivalent of running a scrub on a ZFS filesystem. .It Fl J Cm enable | disable -Turn on/off gjournal flag. +Turn on/off GEOM journaling. +GEOM journaling is incompatible with soft updates. .It Fl k Ar held-for-metadata-blocks Set the amount of space to be held for metadata blocks. When set, the file system preference routines will try to save @@ -173,6 +176,7 @@ been deleted to get under the higher threshold. Turn on/off the administrative NFSv4 ACL enable flag. .It Fl n Cm enable | disable Turn on/off soft updates. +Soft updates are incompatible with GEOM journaling. .It Fl o Cm space | time The file system can either try to minimize the time spent allocating blocks, or it can attempt to minimize the space diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index b0f70b4ef60e..770bb6b8d45e 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -368,6 +368,9 @@ main(int argc, char *argv[]) if ((sblock.fs_flags & (FS_DOSOFTDEP | FS_SUJ)) == (FS_DOSOFTDEP | FS_SUJ)) { warnx("%s remains unchanged as enabled", name); + } else if (sblock.fs_flags & FS_GJOURNAL) { + warnx("%s cannot be enabled while GEOM " + "journaling is enabled", name); } else if (sblock.fs_clean == 0) { warnx("%s cannot be enabled until fsck is run", name); @@ -396,6 +399,9 @@ main(int argc, char *argv[]) if (strcmp(Jvalue, "enable") == 0) { if (sblock.fs_flags & FS_GJOURNAL) { warnx("%s remains unchanged as enabled", name); + } if (sblock.fs_flags & FS_DOSOFTDEP) { + warnx("%s cannot be enabled while soft " + "updates are enabled", name); } else { sblock.fs_flags |= FS_GJOURNAL; warnx("%s set", name); @@ -413,9 +419,9 @@ main(int argc, char *argv[]) } if (kflag) { name = "space to hold for metadata blocks"; - if (sblock.fs_metaspace == kvalue) + if (sblock.fs_metaspace == kvalue) { warnx("%s remains unchanged as %d", name, kvalue); - else { + } else { kvalue = blknum(&sblock, kvalue); if (kvalue > sblock.fs_fpg / 2) { kvalue = blknum(&sblock, sblock.fs_fpg / 2); @@ -487,9 +493,12 @@ main(int argc, char *argv[]) if (nflag) { name = "soft updates"; if (strcmp(nvalue, "enable") == 0) { - if (sblock.fs_flags & FS_DOSOFTDEP) + if (sblock.fs_flags & FS_DOSOFTDEP) { warnx("%s remains unchanged as enabled", name); - else if (sblock.fs_clean == 0) { + } else if (sblock.fs_flags & FS_GJOURNAL) { + warnx("%s cannot be enabled while GEOM " + "journaling is enabled", name); + } else if (sblock.fs_clean == 0) { warnx("%s cannot be enabled until fsck is run", name); } else {