From nobody Sat Mar 21 07:22:09 2026 X-Original-To: dev-commits-src-main@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 4fd9qQ10ysz6WklM for ; Sat, 21 Mar 2026 07:22:10 +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 4fd9qP5xM9z3tnr for ; Sat, 21 Mar 2026 07:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774077729; 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=NRTixWHsQB3rZl0wD0Cr73vp//abuATF0N9g3WdOxsw=; b=EmWikNkwOS+1Oni/cE13sE9t4kz2S2Njf3qbG2F/LMqGCy9OLsgxZpiOk6Fxg28hOApmNq BFw8aCCqTkVIL2F0yD2nIMuWRWgJ48L1GpbG/0fMDsm9xufWklRYblTjd9zybbaZXFc8Kw /38KRnA52qtze6sEc6Zv1ZmTFwbKJJt8RpmejkrpVGToMEt8vzW4fAHnoYrDoWt1Pbj3bD FCKpyMvc4lTkV5zx9lHCS8hgf6kPbvA/kwtyXOzw7YcWKi4/fnrJMKBDuk0OJPjD9oR95Z 3/l+jMH2vWTiSfPBg2yK+1QigPHmZv6wtw5kHFWPGEVUzTgTM47SE6RMGcIGkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774077729; a=rsa-sha256; cv=none; b=ATefJh5LLjS1OluqvLU6d+LPTXWntAxfkXv5tsAuGvGBQuWWlSCmT8S9VyLkQXoQMBeF+w AntnYueCzofXRQszS1ty9OuZYyoCJkmB72jpu67WvpmKbz86/lvYJpd8LE9xJkyxD6505/ b1d7jibU/KHb33pDoCnP4V+MfLBjD/x4yFafgut4LXO3oODdu5imzl3XOlZpSYdqL9eDC7 MvW61VV/2Rpm3T95mQSgq2iF16j9murkuPgs/1ss16R8rsw9SinZXovfY5i5IDwXosFB6/ atht1BFADEuh6XYxto5iHwB4d5ivKRBcsgTxg9OWwMs4mJUEQYtMEteV5tS0Vw== 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=1774077729; 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=NRTixWHsQB3rZl0wD0Cr73vp//abuATF0N9g3WdOxsw=; b=kvkiPdJsvki4Yn/Albc5P6PhUqsDCro3Jas/lAtWg2TD9DA0bjSuUGco/Cqb+hsVy+XTOL L8gmmPKBG8p1KIhqE7i4HiXDVZrKzCEK3xDIqtzh2Mm8VEwWzS2VWeKDOW9zAXk6ozyfMG T/LedKhmK1JtsoF5vl3y7ql5qgnASQ0cKLC1tqZ9ntXQlmPYSjp26ZDyFoCZxIH9FZI4fi fSakUCx8IJBsgZEiMHZQJJeW2R7N5nCz86BTV+3Md47WPJg9QL9jFUZhexgJQ7KBTAJpWn wO0qOejUhGrQROvFgRmVceTdPpzSW/9L7uuGZeVO30qNR5PxrkIoKrid9pXmdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fd9qP4mW5z12Jj for ; Sat, 21 Mar 2026 07:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e981 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Mar 2026 07:22:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b1f72dd2a9a5 - main - tunefs: Don't combine GEOM journaling with SU List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b1f72dd2a9a5e69a310b9e76b55f16cff433b8da Auto-Submitted: auto-generated Date: Sat, 21 Mar 2026 07:22:09 +0000 Message-Id: <69be4721.3e981.44b094b0@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b1f72dd2a9a5e69a310b9e76b55f16cff433b8da commit b1f72dd2a9a5e69a310b9e76b55f16cff433b8da Author: Dag-Erling Smørgrav AuthorDate: 2026-03-21 07:21:33 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-21 07:21:45 +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 --- 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 0fb11041d97d..8c2d0bbf5d1d 100644 --- a/sbin/tunefs/tunefs.8 +++ b/sbin/tunefs/tunefs.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 17, 2023 +.Dd March 20, 2026 .Dt TUNEFS 8 .Os .Sh NAME @@ -92,6 +92,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 @@ -128,7 +130,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 @@ -171,6 +174,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 6f6df8446cd9..d5ef366e8221 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -358,6 +358,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); @@ -386,6 +389,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); @@ -403,9 +409,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); @@ -477,9 +483,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 {