From nobody Tue Nov 05 14:29:57 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 4XjW2G0dyDz5c9xt; Tue, 05 Nov 2024 14:29:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2F6YTRz54sT; Tue, 5 Nov 2024 14:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816997; 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=JcEfjVoVR1T0iXPV6zT1WZEs8RSeMe9nbGHsgeYiFqo=; b=ajCfsb++fDdXVV2n040c99uZtwm4Yox74Al3LuC5BI+DBF4YXuElRiWmIQt8jrg+KtLkxP fk8q/SHI5zH8AdYRslDC2C8/K8mvwgrXxEjhyCYvZJu3WBCWcCkax+1lbZ1vZ2Pma06p9q 5W8tkI8Ugf7WKKnBiJzCERDa4/LB+QbtzdIbsmh3e5s5gQBRYokLJEd6FTFTvSKdqWQFzG 4kc8HZ+Hz0VWSP7tRYMiQOxVN3gM+Fc7nJWiYEK4oyevsXX7cXOHNeJrBeQ5jVR9gl6dzR 54izBIUsvKnWYByBv+h3iNHHz9xBrcE+BGFwzyygUJh8t8mKZGimSyBj5tFn+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816997; 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=JcEfjVoVR1T0iXPV6zT1WZEs8RSeMe9nbGHsgeYiFqo=; b=Wl5bqo97rhLlSugqJTY7xlfoL08BVfi1faF9qfik/F4MgfMQC0G7Z6rXvWGzTo4fjni/eC 3y+vYPX4hmOaql1imgBUzrn30gIVvw46CNU3DkjxWGpn2mWz4RdBB7RwPUtW1cao+GE0/e m7vUWRl0h206/KwMUN4RlSZgTI04sMC7odOkRPwstotVJz1FN7xn9JsyGJbdbeZ3cxoeje Ot49AaGa2B3ld3fvyngOdhnpNU+t04cvz88WPjTh5oDnFJ7f66pBCTcXeKKaObYd3udNFF 2OUJur0TZGmF4G/+dXdfkUA7JsgJ1oaaXRJzRTtjahUt0pp8d+2LbcB9HtpfIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730816997; a=rsa-sha256; cv=none; b=qpL8/47ozWHU3u6X2+OPkjGEt5sJ38wjP7R/tVuN72bWUPz7oiB380FYZ7IOI5YN8SINcS mHwFTC8nqM3LLlfVNS7c88L64tgz6qh/QDVrJFbygw0D6vg3Fia8H7HzY+L7BrdKK1pA1x dg9ZEcGpBt4d9eyRsj2NuceExJz5m7jR+gfHvPRU74yKZie7CbqeKMxGRYoQs17vyB4L9I 6UKvQ5eJsf+ZmigmfHNRUYAGvcpUscXUeCnRpoCeO0Yw15iE5Z3rTQfWsO5Lacco2osRlN Fre74e4bA0mu2Kq8IkfW/+jVAf9XHrB8MBtKkU5i5chcN8AdUgQaNL9E76WOag== 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 4XjW2F5tJBzKh7; Tue, 5 Nov 2024 14:29:57 +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 4A5ETvrD081008; Tue, 5 Nov 2024 14:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5ETvMX081005; Tue, 5 Nov 2024 14:29:57 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:29:57 GMT Message-Id: <202411051429.4A5ETvMX081005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ef89eefaa86f - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ef89eefaa86f315feba6c44f2059582a077a78ed Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef89eefaa86f315feba6c44f2059582a077a78ed commit ef89eefaa86f315feba6c44f2059582a077a78ed Author: Mark Johnston AuthorDate: 2024-10-04 14:53:42 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 00:56:50 +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 (cherry picked from commit d9fe71828797508d1d28655e40780a5ae9078e66) --- 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;