upstream/illumos/illumos-gate: comparison usr/src/lib/libzfs/common/libzfs

equal deleted inserted replaced

-:34f1e4f08632
+:76b439ec3ac1
 }
 /*
 * Detect if any leaf devices that have seen errors or could not be opened.
 */
-static int
+static boolean_t
 find_vdev_problem(nvlist_t *vdev, int (*func)(uint64_t, uint64_t, uint64_t))
 {
 	nvlist_t **child;
 	vdev_stat_t *vs;
 	uint_t c, children;
 	 * out again.  We'll pick up the fact that a resilver is happening
 	 * later.
 	 */
 	verify(nvlist_lookup_string(vdev, ZPOOL_CONFIG_TYPE, &type) == 0);
 	if (strcmp(type, VDEV_TYPE_REPLACING) == 0)
-		return (FALSE);
+		return (B_FALSE);
 	if (nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_CHILDREN, &child,
 	    &children) == 0) {
 		for (c = 0; c < children; c++)
 			if (find_vdev_problem(child[c], func))
-				return (TRUE);
+				return (B_TRUE);
 	} else {
 		verify(nvlist_lookup_uint64_array(vdev, ZPOOL_CONFIG_STATS,
 		    (uint64_t **)&vs, &c) == 0);
 		if (func(vs->vs_state, vs->vs_aux,
 		    vs->vs_read_errors +
 		    vs->vs_write_errors +
 		    vs->vs_checksum_errors))
-			return (TRUE);
+			return (B_TRUE);
 	}
-	return (FALSE);
+	return (B_FALSE);
 }
 /*
 * Active pool health status.
 *
 *
 * There can obviously be multiple errors within a single pool, so this routine
 * only picks the most damaging of all the current errors to report.
 */
 static zpool_status_t
-check_status(nvlist_t *config, int isimport)
+check_status(nvlist_t *config, boolean_t isimport)
 {
 	nvlist_t *nvroot;
 	vdev_stat_t *vs;
 	uint_t vsc;
 	uint64_t nerr;
 }
 zpool_status_t
 zpool_get_status(zpool_handle_t *zhp, char **msgid)
 {
-	zpool_status_t ret = check_status(zhp->zpool_config, FALSE);
+	zpool_status_t ret = check_status(zhp->zpool_config, B_FALSE);
 	if (ret >= NMSGID)
 		*msgid = NULL;
 	else
 		*msgid = msgid_table_active[ret];
 }
 zpool_status_t
 zpool_import_status(nvlist_t *config, char **msgid)
 {
-	zpool_status_t ret = check_status(config, TRUE);
+	zpool_status_t ret = check_status(config, B_TRUE);
 	if (ret >= NMSGID)
 		*msgid = NULL;
 	else
 		*msgid = msgid_table[ret];

changeset 2082	76b439ec3ac1
parent 1760	e1ad2821c30d
child 3975	6674f5d79069