From nobody Sat Apr 4 08:59:32 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 4fnqKK0SV5z6YGYK for ; Sat, 04 Apr 2026 08:59:33 +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 4fnqKJ5Z3qz3L54 for ; Sat, 04 Apr 2026 08:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775293172; 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=GzqJPHfxuelHoGKXkJJA5hmJvFq9V5o6xiWedpf1vcU=; b=LvcC6lZR4WE6Lv/77CThcJEJ5cuEgPNQcvLuEyOa0cHbN/5ZHG2cGwZAT8ZWy8BwppM26O ZphRdryfd0YW44D+dCVNdyDm+pCrN081KB0yvODxwA2GukPB/yeIIPmgRivctgKai4rj97 8xNgg7ew/e8W0iq5aMSo/O0MCsJXGBDo1pFm9/MHy2VfzZdh0lkeupEwCl1Tqmcx3qlZFL SS6ZA4sxbyqBGRd/JH+Mw/I//d1NbVjQdDF0wW7jMn84oIkWLwRPVHqxnfkL/dO9Bb4F6y ougW+tUdwYYtqbplcc1RXnoDB0N//MNg4kb5Uvq+t5+Adlc1iu+9YvGJb7NnJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775293172; a=rsa-sha256; cv=none; b=Q9JOjO6Lxet9W8pljY8geN6kC/7aUlWBHf2d98/J/wyrPZBWn9wutrypGtPUzOPc4u68LS Da4j+LNZBsC87cm0QFBxWt6Sw0Ax9ulIfleVaw6lPNC3n6xjxgyBaVFwdbv0zLHXRdwnAl 0lHOEXhVXNyljhQkpXPvRX+UD2icSmy3i7TAWTShpajhJS5RdMSj56Kbaq8hu2EvZJ2B+I 3ERy0K639i93S1ggTpuZ47pyB70Z47TUQKP89SAjyqUJcSW15G3yhj80Z6qx6D94nZyEdN YaJ5rxeTsTEiCZgG4XBMAvtUtzUwG1NkzL7kxHxi6AZ38nfEFjbJg9fP+ZdyfQ== 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=1775293172; 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=GzqJPHfxuelHoGKXkJJA5hmJvFq9V5o6xiWedpf1vcU=; b=g/KRUz3USJOQs8gbnl7T+qD1Mk6GvJ+xQQHl6tqFu1cCd4wUO7wRsYU6IlkC/ysoMM0Ayl OR7cRpY5Z2KrGzo3oD8a+CBA9dPNFRdmPw3/IcFYUPFvVRfgrF9xQwGzDpJBqxgHaa7AYM jD07AekafPQNK0RDiaz9O+QhCPWHTjooFKWhkEZRqPRf1VeKlgZtgiyl/SpVeo/QkrZGZd 3vXn8zjB0w28xXSOZKzsiImZDlPqvSqtFEA7xpUiTnMFg+VWtJTc7WeBwF0NPwEsNL0scf lrhwkFfFRc7DHBQIDaDGyX95TPVUhvExmK3P1jAOcz8A9QDydpwMqGbjTUGdOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fnqKJ507nz1R1B for ; Sat, 04 Apr 2026 08:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36b45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 04 Apr 2026 08:59:32 +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: c514f8dbeab8 - stable/14 - tunefs: Don't combine GEOM journaling with SU 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c514f8dbeab813c996d426de2aedceb669c4fa2a Auto-Submitted: auto-generated Date: Sat, 04 Apr 2026 08:59:32 +0000 Message-Id: <69d0d2f4.36b45.78d3eafc@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c514f8dbeab813c996d426de2aedceb669c4fa2a commit c514f8dbeab813c996d426de2aedceb669c4fa2a Author: Dag-Erling Smørgrav AuthorDate: 2026-03-21 07:21:33 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-04 08:59:25 +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 9b38e23effd0..6b399f032c9c 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -370,6 +370,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); @@ -398,6 +401,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); @@ -415,9 +421,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); @@ -489,9 +495,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 {