git: d9fe71828797 - main - makefs: Remove the warning printed when makefs -t zfs is used

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=d9fe71828797508d1d28655e40780a5ae9078e66

commit d9fe71828797508d1d28655e40780a5ae9078e66
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-04 14:53:42 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-10-04 15:56:34 +0000

    makefs: Remove the warning printed when makefs -t zfs is used
    
    We haven't seen bug reports relating to this feature for a while, so
    stop printing a warning.
    
    Reviewed by:    cperciva
    MFC after:      2 weeks
---
 usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 +-
 usr.sbin/makefs/zfs.c                     | 8 +-------
 usr.sbin/makefs/zfs/zfs.h                 | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh
index 6e20ae33b354..7040cf9fd736 100644
--- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh
@@ -28,7 +28,7 @@
 # SUCH DAMAGE.
 #
 
-MAKEFS="makefs -t zfs -o nowarn=true"
+MAKEFS="makefs -t zfs"
 ZFS_POOL_NAME="makefstest$$"
 TEST_ZFS_POOL_NAME="$TMPDIR/poolname"
 
diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c
index b16a48564f04..a0c81f9654ab 100644
--- a/usr.sbin/makefs/zfs.c
+++ b/usr.sbin/makefs/zfs.c
@@ -92,7 +92,7 @@ zfs_prep_opts(fsinfo_t *fsopts)
 		{ '\0', "ashift", &zfs->ashift, OPT_INT32,
 		  MINBLOCKSHIFT, MAXBLOCKSHIFT, "ZFS pool ashift" },
 		{ '\0', "nowarn", &zfs->nowarn, OPT_BOOL,
-		  0, 0, "Suppress warning about experimental ZFS support" },
+		  0, 0, "Provided for backwards compatibility, ignored" },
 		{ .name = NULL }
 	};
 
@@ -779,12 +779,6 @@ zfs_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts)
 
 	zfs_check_opts(fsopts);
 
-	if (!zfs->nowarn) {
-		fprintf(stderr,
-		    "ZFS support is currently considered experimental. "
-		    "Do not use it for anything critical.\n");
-	}
-
 	dirfd = open(dir, O_DIRECTORY | O_RDONLY);
 	if (dirfd < 0)
 		err(1, "open(%s)", dir);
diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h
index ff94c270bbf6..5c47b7c3156b 100644
--- a/usr.sbin/makefs/zfs/zfs.h
+++ b/usr.sbin/makefs/zfs/zfs.h
@@ -73,7 +73,7 @@ typedef struct {
 	 */
 	char		filebuf[MAXBLOCKSIZE] __aligned(alignof(uint64_t));
 
-	bool		nowarn;
+	bool		nowarn;		/* ignored */
 
 	/* Pool parameters. */
 	const char	*poolname;