From c7befad67909a781738b81d0879cd90ba102a77c Mon Sep 17 00:00:00 2001
From: schwarze <schwarze@openbsd.org>
Date: Fri, 10 Nov 2023 00:25:59 +0000
Subject: [PATCH] MNT_SOFTDEP  and  mount -o softdep  no longer have any effect
 OK kn@ jmc@

---
 lib/libc/sys/mount.2 | 10 +++++-----
 sbin/mount/mount.8   | 33 ++++++++-------------------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 1dea9935cc9..97c614a1f6d 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.2,v 1.51 2022/12/29 14:56:48 schwarze Exp $
+.\"	$OpenBSD: mount.2,v 1.52 2023/11/10 00:25:59 schwarze Exp $
 .\"	$NetBSD: mount.2,v 1.12 1996/02/29 23:47:48 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mount.2	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: December 29 2022 $
+.Dd $Mdocdate: November 10 2023 $
 .Dt MOUNT 2
 .Os
 .Sh NAME
@@ -92,9 +92,9 @@ All I/O to the filesystem should be done synchronously.
 .It Dv MNT_ASYNC
 All I/O to the filesystem should be done asynchronously.
 .It Dv MNT_SOFTDEP
-Use soft dependencies.
-Applies to FFS filesystems only (see 'softdep' in
-.Xr mount 8 ) .
+Use soft dependencies on an FFS filesystem.
+This flag is provided for compatibility only and has no effect on
+.Ox .
 .It Dv MNT_WXALLOWED
 Processes that ask for memory to be made writeable plus executable
 using the
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 6e7251c05a3..7efff2ea343 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.8,v 1.91 2023/11/09 12:47:05 kn Exp $
+.\"	$OpenBSD: mount.8,v 1.92 2023/11/10 00:26:00 schwarze Exp $
 .\"	$NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mount.8	8.7 (Berkeley) 3/27/94
 .\"
-.Dd $Mdocdate: November 9 2023 $
+.Dd $Mdocdate: November 10 2023 $
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -152,10 +152,10 @@ Options can be given with (or without) a
 prefix to invert their meaning.
 The options listed below specify non-default values.
 For example,
-.Sq nosoftdep
+.Sq nosync
 is the default, so
-.Sq softdep
-can be used to mount the file system using soft dependencies.
+.Sq sync
+can be used to write regular data synchronously.
 Multiple options can be specified in a comma-separated list.
 The available options are as follows:
 .Bl -tag -width 9n
@@ -173,12 +173,6 @@ system crash.
 The most common use of this flag is to speed up
 .Xr restore 8
 where it can give a factor of two speed increase.
-.Pp
-The options
-.Ic async
-and
-.Ic softdep
-are mutually exclusive.
 .It Cm force
 The same as
 .Fl f ;
@@ -220,20 +214,9 @@ mount the file system read-only (even the superuser may not write it).
 .It Cm ro
 An alias for rdonly.
 .It Cm softdep
-(FFS only)
-Mount the file system using soft dependencies.
-Instead of metadata being written immediately, it is written in an ordered
-fashion to keep the on-disk state of the file system consistent.
-This results in significant speedups for file create/delete operations.
-This option is ignored when using the
-.Fl u
-flag and a file system is already mounted read/write.
-.Pp
-The options
-.Ic async
-and
-.Ic softdep
-are mutually exclusive.
+Mount an FFS file system using soft dependencies.
+This option is only supported for compatibility and has no effect on
+.Ox .
 .It Cm sync
 Regular data I/O to the file system should be done synchronously.
 By default, only metadata is read/written synchronously.
-- 
2.20.1