From nobody Tue Nov 5 16:19:34 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 4XjYSk357Zz5cHDN; Tue, 05 Nov 2024 16:19:34 +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 4XjYSk2G3pz41hk; Tue, 5 Nov 2024 16:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823574; 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=sA6nupOUeiGXHKXm9NU1UvCloT+vhNXnI7U+57RYMtw=; b=axXlEnqIhDRP364OX1RTJfmFcHdmxM3Z5eDKvdCwcV6I3/99sxgI7H3SFpLGU1RkQV8SpY HLzc5Cmnt11ytEu1IsNXjSVA/eWVeQ5pKvPXOwASLI9wJQBiXzg1Qb+zPrdq1C0r4IcdiE gIgnyfoFz0RtoD62bmnkVakaEoGJeHYfwKD01+pIloVUre149ifcopNUTVNdxtPqU35A3J klnwiQgG7i8USwswB0oxgZDrI92t8vgLtu1IRqbdRmBRMyMcJnuFbcDHIkQ9gG4bxbhDxk ndPGscUzjeQD278mund8WejOwvvjMg+RDpOFD/m8+BKJA4GhGqyIGBCdANv/JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823574; 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=sA6nupOUeiGXHKXm9NU1UvCloT+vhNXnI7U+57RYMtw=; b=L0fiI3Xgj5017qDGWyzNtgf6IRXIH1xemdS3FAkv/96mFNYeH5kZnHtq3RpKnz5Fv4KveR OOT2KtL48X558zx0lJ4b89JUTrabP/9iQ9n0QRLMYQo5WP/tXbN2T+DAlw3wJbqf68sNks rIrkJyjzVfasTzdP5iBDPUNw1WEqR5yzockDlZVnuSNL62+0bYzh/sdjQHbUJtuolG51M2 DQPEiSym/aiivZwHq2Us0bg8y2kqqx3sA2fjhB9dlynwnHeJW89w7jxFF8K0ZLf7OqGyyC cmnaGYUV3Ea/fJ9X283Ib/D+v8PvQqEODi1PC9GUGQMtEs3oWC/qC0Kvm6BSHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730823574; a=rsa-sha256; cv=none; b=Ijsu6YsxIAUSyeBA6Y90nK4svy5EhefT4VELkF0LDzuxvH6boNNoKLUONOr/cFxbG0/T3e Aq02NDlGqcWROJ50B9Kb58+IN6g5mkAIGfWB2LJWGlOEwBqahuKmRoC+XIWM5markHsii1 Q1O38cfbUkmYV3UtAAdRUgZt9TInro3mU/fs/Kh5wg/3e28kUa/S8/ebl4ifWD4RaPUIMa +QFzA2Cyu8jc2f6fqEL0yXNwMJ927uJSaU1YXYTWY+rsv6a9utsxSMxanzUULW4EvcdAfy lwETOHE3VSaqCZ5P3vgAXYb6q4ekHASupZ0AsPywzejnxWptxyjk8wq2uYG2xg== 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 4XjYSk1YdJzP2G; Tue, 5 Nov 2024 16:19:34 +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 4A5GJYNB084553; Tue, 5 Nov 2024 16:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5GJYOG084550; Tue, 5 Nov 2024 16:19:34 GMT (envelope-from git) Date: Tue, 5 Nov 2024 16:19:34 GMT Message-Id: <202411051619.4A5GJYOG084550@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: f675d2bb3455 - releng/14.2 - 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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: f675d2bb3455f174f1caaceb4130abc6a677aa82 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f675d2bb3455f174f1caaceb4130abc6a677aa82 commit f675d2bb3455f174f1caaceb4130abc6a677aa82 Author: Mark Johnston AuthorDate: 2024-10-04 14:53:42 +0000 Commit: Mark Johnston 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;