summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/tunefs/tunefs.813
-rw-r--r--sbin/tunefs/tunefs.c27
2 files changed, 7 insertions, 33 deletions
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index f43f334274c..04aab774887 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tunefs.8,v 1.14 2000/03/18 22:56:06 aaron Exp $
+.\" $OpenBSD: tunefs.8,v 1.15 2001/04/08 00:00:43 gluk Exp $
.\" $NetBSD: tunefs.8,v 1.8 1995/03/18 15:01:29 cgd Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -50,7 +50,6 @@
.Bk -words
.Op Fl o Ar optimize_preference
.Ek
-.Op Fl s Ar enable | disable
.Op Ar special | Ar filesys
.Sh DESCRIPTION
.Nm
@@ -124,16 +123,6 @@ are on the selected file system.
More detailed information can be obtained in the
.Xr dumpfs 8
manual page.
-.It Fl s Ar enable_or_disable
-This option enables soft updates on the file system.
-Soft updates
-eliminates most synchronous writes to disk by maintaining
-a partial order of writes to the disk.
-This significantly improves
-meta-data operations (file creation and deletion) at the expense of
-subjecting them to the same potential 30-second delay as file data.
-Recovery is made simpler, however, by maintaining a strict ordering of
-writes to disk.
.El
.Sh SEE ALSO
.Xr fs 5 ,
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index b63a4eaa332..b528ac553c1 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tunefs.c,v 1.10 2001/04/06 20:43:31 gluk Exp $ */
+/* $OpenBSD: tunefs.c,v 1.11 2001/04/08 00:00:42 gluk Exp $ */
/* $NetBSD: tunefs.c,v 1.10 1995/03/18 15:01:31 cgd Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94";
#else
-static char rcsid[] = "$OpenBSD: tunefs.c,v 1.10 2001/04/06 20:43:31 gluk Exp $";
+static char rcsid[] = "$OpenBSD: tunefs.c,v 1.11 2001/04/08 00:00:42 gluk Exp $";
#endif
#endif /* not lint */
@@ -90,7 +90,7 @@ main(argc, argv)
int argc;
char *argv[];
{
- char *cp, *special, *name, *action;
+ char *cp, *special, *name;
struct stat st;
int i;
int Aflag = 0;
@@ -220,22 +220,8 @@ again:
continue;
case 's':
- name = "soft updates";
- if (argc < 1)
- errx(10, "-s: missing %s", name);
- argc--, argv++;
- if (strcmp(*argv, "enable") == 0) {
- sblock.fs_flags |= FS_DOSOFTDEP;
- action = "set";
- } else if (strcmp(*argv, "disable") == 0) {
- sblock.fs_flags &= ~FS_DOSOFTDEP;
- action = "cleared";
- } else {
- errx(10, "bad %s (options are %s)",
- name, "`enable' or `disable'");
- }
- warnx("%s %s", name, action);
- continue;
+ errx(1, "See mount(8) for details about"
+ " how to enable soft updates.");
case 'o':
name = "optimization preference";
@@ -295,8 +281,7 @@ usage()
"\t-m minimum percentage of free space\n"
"\t-n expected number of files per directory\n"
"\t-o optimization preference (`space' or `time')\n"
- "\t-p no change - just prints current tuneable settings\n"
- "\t-s soft updates ('enable' or 'disable')\n",
+ "\t-p no change - just prints current tuneable settings\n",
__progname);
exit(2);
}