git: f675d2bb3455 - releng/14.2 - makefs: Remove the warning printed when makefs -t zfs is used

The branch releng/14.2 has been updated by markj:

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

commit f675d2bb3455f174f1caaceb4130abc6a677aa82
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-04 14:53:42 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-11-05 16:19:13 +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.
    
    Approved by:    re (kib)
    Reviewed by:    cperciva
    MFC after:      2 weeks
    
    (cherry picked from commit d9fe71828797508d1d28655e40780a5ae9078e66)
    (cherry picked from commit ef89eefaa86f315feba6c44f2059582a077a78ed)
---
 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 9196232ed3b3..aeda889d9a5c 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 verify-txgs=true -o nowarn=true"
+MAKEFS="makefs -t zfs -o verify-txgs=true"
 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 43469c2358be..66e7f8dafc9c 100644
--- a/usr.sbin/makefs/zfs.c
+++ b/usr.sbin/makefs/zfs.c
@@ -94,7 +94,7 @@ zfs_prep_opts(fsinfo_t *fsopts)
 		{ '\0', "verify-txgs", &zfs->verify_txgs, OPT_BOOL,
 		  0, 0, "Make OpenZFS verify data upon import" },
 		{ '\0', "nowarn", &zfs->nowarn, OPT_BOOL,
-		  0, 0, "Suppress warning about experimental ZFS support" },
+		  0, 0, "Provided for backwards compatibility, ignored" },
 		{ .name = NULL }
 	};
 
@@ -792,12 +792,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 924fad83f63e..33694e2bdbee 100644
--- a/usr.sbin/makefs/zfs/zfs.h
+++ b/usr.sbin/makefs/zfs/zfs.h
@@ -74,7 +74,7 @@ typedef struct {
 	 */
 	char		filebuf[MAXBLOCKSIZE] __aligned(alignof(uint64_t));
 
-	bool		nowarn;
+	bool		nowarn;		/* ignored */
 
 	/* Pool parameters. */
 	const char	*poolname;