From owner-svn-src-all@freebsd.org Wed Nov 18 01:18:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8D02D474D50; Wed, 18 Nov 2020 01:18:45 +0000 (UTC) (envelope-from cy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CbQ1d3bYrz4SZF; Wed, 18 Nov 2020 01:18:45 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6EC9D18FD; Wed, 18 Nov 2020 01:18:45 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AI1Ij0b018565; Wed, 18 Nov 2020 01:18:45 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AI1Ij82018564; Wed, 18 Nov 2020 01:18:45 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202011180118.0AI1Ij82018564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 18 Nov 2020 01:18:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367779 - head/sys/contrib/openzfs/cmd/zpool X-SVN-Group: head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/sys/contrib/openzfs/cmd/zpool X-SVN-Commit-Revision: 367779 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2020 01:18:45 -0000 Author: cy Date: Wed Nov 18 01:18:45 2020 New Revision: 367779 URL: https://svnweb.freebsd.org/changeset/base/367779 Log: Restore identification of VDEVs using non-native block size. NAME STATE READ WRITE CKSUM dsk02 ONLINE 0 0 0 mirror-0 ONLINE 0 0 0 ada1s4a ONLINE 0 0 0 ada2s4a ONLINE 0 0 0 block size: 512B configured, 4096B native Reviewed by: tsoome (previous FreeBSD phab version) Differential Revision: https://reviews.freebsd.org/D26880 Upstream commit: 3928ec53395fcc26be7844dd6b63df757166c281 Reviewed-by: Matt Macy Reviewed-by: Toomas Soome Reviewed-by: Brian Behlendorf Signed off by: Cy Schubert Closes #11088 Modified: head/sys/contrib/openzfs/cmd/zpool/zpool_main.c Modified: head/sys/contrib/openzfs/cmd/zpool/zpool_main.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zpool/zpool_main.c Tue Nov 17 21:20:11 2020 (r367778) +++ head/sys/contrib/openzfs/cmd/zpool/zpool_main.c Wed Nov 18 01:18:45 2020 (r367779) @@ -2254,6 +2254,13 @@ print_status_config(zpool_handle_t *zhp, status_cbdata break; } color_end(); + } else if (children == 0 && !isspare && + getenv("ZPOOL_STATUS_NON_NATIVE_ASHIFT_IGNORE") == NULL && + VDEV_STAT_VALID(vs_physical_ashift, vsc) && + vs->vs_configured_ashift < vs->vs_physical_ashift) { + (void) printf( + gettext(" block size: %dB configured, %dB native"), + 1 << vs->vs_configured_ashift, 1 << vs->vs_physical_ashift); } /* The root vdev has the scrub/resilver stats */