From 017d52e38ab332b140ab40231ef920bcc3b2b1c1 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Tue, 14 May 2024 22:38:35 -0700
Subject: [PATCH] Enable soft updates by default for UFS2 filesystems.

Reviewed-by: Warner Losh, kib
Differential Revision: https://reviews.freebsd.org/D45201

(cherry picked from commit 61dece6d27fb2436928ca93d65667b358e05aa7b)
---
 sbin/newfs/newfs.8 | 8 +++++---
 sbin/newfs/newfs.c | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 915304caaa40..0b9f66a7e76d 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -25,9 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\"
-.Dd October 21, 2022
+.Dd May 18, 2024
 .Dt NEWFS 8
 .Os
 .Sh NAME
@@ -100,6 +98,10 @@ The default format is UFS2.
 For backward compatibility.
 .It Fl U
 Enable soft updates on the new file system.
+Soft updates are enabled by default for UFS2 format file systems.
+Use
+.Xr tunefs 8
+to disable soft updates if they are not wanted.
 .It Fl a Ar maxcontig
 Specify the maximum number of contiguous blocks that will be
 laid out before forcing a rotational delay.
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 1db317766692..6e69a6c5437b 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -391,6 +391,9 @@ main(int argc, char *argv[])
 		fprintf(stderr, "because minfree is less than %d%%\n", MINFREE);
 		opt = FS_OPTSPACE;
 	}
+	/* Use soft updates by default for UFS2 and above */
+	if (Oflag > 1)
+		Uflag = 1;
 	realsectorsize = sectorsize;
 	if (sectorsize != DEV_BSIZE) {		/* XXX */
 		int secperblk = sectorsize / DEV_BSIZE;