From 6b4f0b65f9fa98e2a144101a61cb1bcbcb956cc5 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 5 May 2024 07:26:58 +0000
Subject: [PATCH] Stop building with and documenting FFS_SOFTUPDATES. Code that
 used it was removed in February.

---
 share/man/man4/options.4 | 16 ++--------------
 sys/conf/GENERIC         |  3 +--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 3fdf8bd9453..a6ed33cc497 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.270 2023/12/14 13:34:23 claudio Exp $
+.\"	$OpenBSD: options.4,v 1.271 2024/05/05 07:26:58 jsg Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -34,7 +34,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: December 14 2023 $
+.Dd $Mdocdate: May 5 2024 $
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -253,18 +253,6 @@ With this option, only the superuser can set them, and they can't be cleared
 if the securelevel is greater than 0.
 See also
 .Xr chflags 1 .
-.It Cd option FFS_SOFTUPDATES
-Enables a scheme that uses partial ordering of buffer cache operations
-to allow metadata updates in FFS to happen asynchronously, increasing write
-performance significantly.
-Normally, the FFS filesystem writes metadata updates synchronously which exacts
-a performance penalty in favor of filesystem integrity.
-With soft updates, the performance of asynchronous writes is gained while
-retaining the safety of synchronous metadata updates.
-.Pp
-Soft updates must be enabled on a per-filesystem basis.
-See
-.Xr mount 8 .
 .It Cd option FIFO
 Adds support for
 .At V
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 3ab6eb1bced..9ffe0fc3480 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.295 2024/03/13 14:43:31 bluhm Exp $
+#	$OpenBSD: GENERIC,v 1.296 2024/05/05 07:26:58 jsg Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -29,7 +29,6 @@ option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
 
 option		FFS		# UFS
 option		FFS2		# UFS2
-option		FFS_SOFTUPDATES	# Soft updates
 option		UFS_DIRHASH	# hash large directories
 option		QUOTA		# UFS quotas
 option		EXT2FS		# Second Extended Filesystem
-- 
2.20.1