From nobody Fri Oct 04 15:57:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XKtTd1Xttz5Xxd3; Fri, 04 Oct 2024 15:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKtTc6RQBz41Rx; Fri, 4 Oct 2024 15:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kzo7/lrgs0wBZR5QSLdTyWdb0kGMohNlC89AjuIK0z8=; b=QChRnS4xcU5nS44Dw9cOhAa3mBPsVSDvVfTt74lzYFXX283obcwL/g/DMIGiAGnIaGdLk1 wfhwhwVi7zf/oHp/DPuMINKcGEzNKKYjnzoWygzGGmvzdmDArEdA9Pbr/v91ji8IXSiC14 QWjdmjxLUBkkSBs8hTaY5VOLcap6AAybnQ2uLuroF0qR4gbFEEnGrcIqSE9/ODW5NCKsiD qQEPrH+62vEYapyRne9akdXXo5fau4n25oaoALuPRjAWI5Bnp/hpgsLITVmggYTSX9Bp+w 2xclbYkeoNj7x2g+FrHPI9JJ8duag3mporrJGtBhWUVUh5wS+A5Tmdm+qWy9TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728057428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kzo7/lrgs0wBZR5QSLdTyWdb0kGMohNlC89AjuIK0z8=; b=mjqlfA7X5fBD1n3u8q20tzCfUFbzmzjjLzl4j6qNb4YmGY5HfOu+zDjlKVNCBiuNmNWNed xHvbwljJa4IJcFLCR80RCnvDh6GK37YYOF5d2PWt+GNm7uDNkUeERIl1oWuDjPxTnBEnqn H5u3fpoVKOnnXxa0fyU3JtKUBKs0V7zLG3JQcHBXRRP6K1SBWK5GSQCGW9cVj58sOOSbbv WoJgD2ZcNTnd+ddX5/i7KQp+B5+8W3n2KlKbz4RBS/t2NDygoQj9x8fDRCbPL4zcMAJU+O Y7b3qLC1GHkD0/vQ8Lkk6bmtJktAKJCtliHvypRBG2H5O6D1XqtBSEOZMO9wPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728057428; a=rsa-sha256; cv=none; b=vSZeIhPY8EUvSZTmKJW4b0m6HhsbZhmVwqdZA3Xb0rrR281Dar/SfrgRwvFQfbT+vBfFzN XSoeZ0Pd4yPX4laR5MleZV9eXkBWfIQkQ1ceyhdMMrHo059v+3JrVby3YrVr6S1p88Y6XA SfCl3C1x07J/rzwC644I330hvb6DfgoL1kC5WWRCBzQB8RJMamsud0oUWYS9IX/Cc75ZIb BOL/Gms0TemOGHR2CFSe9nq3f/4Y7XdJGtHxDpUoIGxRf5SlrhqACx6MzpBKTNWq2iXZ3s 28YCO704XIiD/fytf4zZIY+508nQoa8TPNUOioPdSHw/ALL24pAyBzzAgwdY0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XKtTc5xFhzgnn; Fri, 4 Oct 2024 15:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 494Fv8rq048723; Fri, 4 Oct 2024 15:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Fv8Zk048720; Fri, 4 Oct 2024 15:57:08 GMT (envelope-from git) Date: Fri, 4 Oct 2024 15:57:08 GMT Message-Id: <202410041557.494Fv8Zk048720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d9fe71828797 - main - makefs: Remove the warning printed when makefs -t zfs is used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9fe71828797508d1d28655e40780a5ae9078e66 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d9fe71828797508d1d28655e40780a5ae9078e66 commit d9fe71828797508d1d28655e40780a5ae9078e66 Author: Mark Johnston AuthorDate: 2024-10-04 14:53:42 +0000 Commit: Mark Johnston 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;