Remove the -a maxcontig option, the kernel doesn't inspect fs_maxcontig

anymore.

Sponsored by:	DARPA & NAI Labs.

2 files changed, 3 insertions, 27 deletions

diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 65ff0de..3f9a4aa 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -41,7 +41,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl A
-.Op Fl a Ar maxcontig
 .Op Fl e Ar maxbpg
 .Op Fl f Ar avgfilesize
 .Op Fl m Ar minfree
@@ -70,10 +69,6 @@ Specifying
 this option will cause all backups to be modified as well as the
 primary super-block.
 This is potentially dangerous - use with caution.
-.It Fl a Ar maxcontig
-Specify the maximum number of contiguous blocks that will
-be laid out before allowing a rotational delay.
-The default value is 16.
 .It Fl e Ar maxbpg
 Indicate the maximum number of blocks any single file can
 allocate out of a cylinder group before it is forced to begin
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 15373ce..74f4bee 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -94,9 +94,9 @@ main(argc, argv)
 	const char *name;
 	struct stat st;
 	int Aflag = 0, active = 0;
-	int aflag = 0, eflag = 0, fflag = 0, mflag = 0;
+	int eflag = 0, fflag = 0, mflag = 0;
 	int nflag = 0, oflag = 0, pflag = 0, sflag = 0;
-	int avalue = 0, evalue = 0, fvalue = 0;
+	int evalue = 0, fvalue = 0;
 	int mvalue = 0, ovalue = 0, svalue = 0;
 	char *nvalue = NULL; 
 	struct fstab *fs;
@@ -109,20 +109,12 @@ main(argc, argv)
         if (argc < 3)
                 usage();
 	found_arg = 0; /* at least one arg is required */
-	while ((ch = getopt(argc, argv, "Aa:e:f:m:n:o:ps:")) != -1)
+	while ((ch = getopt(argc, argv, "Ae:f:m:n:o:ps:")) != -1)
 	  switch (ch) {
 	  case 'A':
 		found_arg = 1;
 		Aflag++;
 		break;
-	  case 'a':
-		found_arg = 1;
-		name = "maximum contiguous block count";
-		avalue = atoi(optarg);
-		if (avalue < 1)
-			errx(10, "%s must be >= 1 (was %s)", name, optarg);
-		aflag = 1;
-		break;
 	  case 'e':
 		found_arg = 1;
 		name = "maximum blocks per file in a cylinder group";
@@ -221,17 +213,6 @@ again:
 		printfs();
 		exit(0);
 	}
-	if (aflag) {
-		name = "maximum contiguous block count";
-		if (sblock.fs_maxcontig == avalue) {
-			warnx("%s remains unchanged as %d", name, avalue);
-		}
-		else {
-			warnx("%s changes from %d to %d",
-					name, sblock.fs_maxcontig, avalue);
-			sblock.fs_maxcontig = avalue;
-		}
-	}
 	if (eflag) {
 		name = "maximum blocks per file in a cylinder group";
 		if (sblock.fs_maxbpg == evalue) {