bye bye -U (soft updates).

3 files changed, 6 insertions, 17 deletions

diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 82ee4b6bcd9..2368e523f98 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs.c,v 1.15 2001/01/16 03:05:44 deraadt Exp $	*/
+/*	$OpenBSD: mkfs.c,v 1.16 2001/04/04 22:06:38 gluk Exp $	*/
 /*	$NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)mkfs.c	8.3 (Berkeley) 2/3/94";
 #else
-static char rcsid[] = "$OpenBSD: mkfs.c,v 1.15 2001/01/16 03:05:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkfs.c,v 1.16 2001/04/04 22:06:38 gluk Exp $";
 #endif
 #endif /* not lint */
 
@@ -83,7 +83,6 @@ static char rcsid[] = "$OpenBSD: mkfs.c,v 1.15 2001/01/16 03:05:44 deraadt Exp $
 extern int	mfs;		/* run as the memory based filesystem */
 extern int	Nflag;		/* run mkfs without writing file system */
 extern int	Oflag;		/* format as an 4.3BSD file system */
-extern int	Uflag;		/* enable soft updates for file system */
 extern int	fssize;		/* file system size */
 extern int	ntracks;	/* # tracks/cylinder */
 extern int	nsectors;	/* # sectors/track */
@@ -189,9 +188,6 @@ mkfs(pp, fsys, fi, fo)
 		sblock.fs_inodefmt = FS_44INODEFMT;
 		sblock.fs_maxsymlinklen = MAXSYMLINKLEN;
 	}
-	if (Uflag) {
-		sblock.fs_flags |= FS_DOSOFTDEP;
-	}
 	/*
 	 * Validate the given file system size.
 	 * Verify that its last block can actually be accessed.
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 7728826d724..f1087dcbd61 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newfs.8,v 1.24 2001/04/03 22:59:35 millert Exp $
+.\"	$OpenBSD: newfs.8,v 1.25 2001/04/04 22:06:39 gluk Exp $
 .\"	$NetBSD: newfs.8,v 1.12 1995/03/18 14:58:41 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993, 1994
@@ -42,7 +42,7 @@
 .Nd construct a new file system
 .Sh SYNOPSIS
 .Nm newfs
-.Op Fl NOU
+.Op Fl NO
 .Op Fl S Ar sector-size
 .Op Fl a Ar maxcontig
 .Op Fl b Ar block-size
@@ -147,8 +147,6 @@ Creates a
 format filesystem.
 This options is primarily used to build root filesystems
 that can be understood by older boot ROMs.
-.It Fl U
-Enables soft updates on the new filesystem.
 .It Fl q
 Operate in quiet mode.
 With this option,
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 37a923ba764..07a1a3758a4 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.23 2001/04/03 22:59:35 millert Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.24 2001/04/04 22:06:39 gluk Exp $	*/
 /*	$NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.8 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.23 2001/04/03 22:59:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.24 2001/04/04 22:06:39 gluk Exp $";
 #endif
 #endif /* not lint */
 
@@ -151,7 +151,6 @@ void	fatal();
 int	mfs;			/* run as the memory based filesystem */
 int	Nflag;			/* run without writing file system */
 int	Oflag;			/* format as an 4.3BSD file system */
-int	Uflag;			/* enable soft updates for file system */
 int	fssize;			/* file system size */
 int	ntracks;		/* # tracks/cylinder */
 int	nsectors;		/* # sectors/track */
@@ -237,9 +236,6 @@ main(argc, argv)
 			disktype = optarg;
 			break;
 #endif
-		case 'U':
-			Uflag = 1;
-			break;
 		case 'a':
 			if ((maxcontig = atoi(optarg)) <= 0)
 				fatal("%s: bad maximum contiguous blocks\n",
@@ -723,7 +719,6 @@ struct fsoptions {
 #ifdef COMPAT
 	{ "-T disktype", 0 },
 #endif
-	{ "-U enable soft updates", 0 },
 	{ "-a maximum contiguous blocks", 1 },
 	{ "-b block size", 1 },
 	{ "-c cylinders/group", 1 },