svn commit: r259784 - stable/10/cddl/contrib/opensolaris/cmd/zpool

[Xin LI]

Author: delphij
Date: Mon Dec 23 20:16:54 2013
New Revision: 259784
URL: http://svnweb.freebsd.org/changeset/base/259784

Log:
  MFC r259131:
  
  Don't panic when we get ZPOOL_STATUS_NON_NATIVE_ASHIFT
  while listing importable pools.

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Dec 23 19:51:30 2013	(r259783)
+++ stable/10/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Dec 23 20:16:54 2013	(r259784)
@@ -1702,6 +1702,12 @@ show_import(nvlist_t *config)
 		    "resilvered.\n"));
 		break;
 
+	case ZPOOL_STATUS_NON_NATIVE_ASHIFT:
+		(void) printf(gettext("status: One or more devices were "
+		    "configured to use a non-native block size.\n"
+		    "\tExpect reduced performance.\n"));
+		break;
+
 	default:
 		/*
 		 * No other status can be seen when importing pools.