svn commit: r367779 - head/sys/contrib/openzfs/cmd/zpool

[Cy Schubert]

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 <mmacy at FreeBSD.org>
  Reviewed-by:		Toomas Soome <tsoome at me.com>
  Reviewed-by:		Brian Behlendorf <behlendorf1 at llnl.gov>
  Signed off by:		Cy Schubert <cy at FreeBSD.org>
  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 */