From e461c7bc7dde5dc84dc9e04cb623c6f567bfe6e5 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@FreeBSD.org>
Date: Sat, 1 Jun 2024 12:38:16 -0600
Subject: [PATCH] mdconfig: remove the "cluster" option.

It's never had any effect.  The kernel ignores it.  Remove it from the
documentation.  But continue to parse it on the command line, for
backwards-compatibility.

Reviewed by:	imp
Pull Request:	https://github.com/freebsd/freebsd-src/pull/1271
---
 sbin/mdconfig/mdconfig.8 |  4 +---
 sbin/mdconfig/mdconfig.c | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 73d4b30aac35..9a86a9c686fd 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
 .\"
-.Dd August 27, 2021
+.Dd June 1, 2024
 .Dt MDCONFIG 8
 .Os
 .Sh NAME
@@ -230,8 +230,6 @@ option tends to waste memory by giving unwanted double caching,
 but it saves time if there is memory to spare.
 .It Oo Cm no Oc Ns Cm reserve
 Allocate and reserve all needed storage from the start, rather than as needed.
-.It Oo Cm no Oc Ns Cm cluster
-Enable clustering on this disk.
 .It Oo Cm no Oc Ns Cm compress
 Enable/disable compression features to reduce memory usage.
 .It Oo Cm no Oc Ns Cm force
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index abcb34c1fed1..4b03dd81e591 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -87,7 +87,7 @@ usage(void)
 "       mdconfig -l [-v] [-n] [-f file] [-u unit]\n"
 "       mdconfig file\n");
 	fprintf(stderr, "\t\ttype = {malloc, vnode, swap}\n");
-	fprintf(stderr, "\t\toption = {async, cache, cluster, compress,\n");
+	fprintf(stderr, "\t\toption = {async, cache, compress,\n");
 	fprintf(stderr, "\t\t          force, mustdealloc, readonly, ro,\n");
 	fprintf(stderr, "\t\t          reserve, verify}\n");
 	fprintf(stderr, "\t\tsize = %%d (512 byte blocks), %%db (B),\n");
@@ -156,13 +156,13 @@ main(int argc, char **argv)
 				mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS;
 			} else if (!strcmp(optarg, "vnode")) {
 				mdio.md_type = MD_VNODE;
-				mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS;
+				mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS;
 			} else if (!strcmp(optarg, "swap")) {
 				mdio.md_type = MD_SWAP;
-				mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS;
+				mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS;
 			} else if (!strcmp(optarg, "null")) {
 				mdio.md_type = MD_NULL;
-				mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS;
+				mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS;
 			} else
 				errx(1, "unknown type: %s", optarg);
 			break;
@@ -182,10 +182,15 @@ main(int argc, char **argv)
 				mdio.md_options |= MD_CACHE;
 			else if (!strcmp(optarg, "nocache"))
 				mdio.md_options &= ~MD_CACHE;
-			else if (!strcmp(optarg, "cluster"))
-				mdio.md_options |= MD_CLUSTER;
-			else if (!strcmp(optarg, "nocluster"))
-				mdio.md_options &= ~MD_CLUSTER;
+			/*
+			 * For backwards-compatibility, continue to recognize
+			 * "cluster"
+			 */
+			else if (!strcmp(optarg, "cluster") ||
+				 !strcmp(optarg, "nocluster"))
+			{
+				warnx("Option cluster is ignored");
+			}
 			else if (!strcmp(optarg, "compress"))
 				mdio.md_options |= MD_COMPRESS;
 			else if (!strcmp(optarg, "nocompress"))
@@ -282,13 +287,11 @@ main(int argc, char **argv)
 			if (fflag != NULL || argc > 0) {
 				/* Imply ``-t vnode'' */
 				mdio.md_type = MD_VNODE;
-				mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT |
-				    MD_COMPRESS;
+				mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS;
 			} else if (sflag != NULL) {
 				/* Imply ``-t swap'' */
 				mdio.md_type = MD_SWAP;
-				mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT |
-				    MD_COMPRESS;
+				mdio.md_options |= MD_AUTOUNIT | MD_COMPRESS;
 			} else
 				errx(1, "unable to determine type");
 		}
@@ -434,10 +437,6 @@ print_options(const char *dev, const char *file)
 		printf("%scache", sep);
 		sep = ",";
 	}
-	if (mdiox.md_options & MD_CLUSTER) {
-		printf("%scluster", sep);
-		sep = ",";
-	}
 	if (mdiox.md_options & MD_COMPRESS) {
 		printf("%scompress", sep);
 		sep = ",";