Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

module/zfs/metaslab.c

@@ -258,6 +258,7 @@ metaslab_block_picker(avl_tree_t *t, uint64_t *cursor, uint64_t size,
 	return (metaslab_block_picker(t, cursor, size, align));
 }
 
+#if 0
 /*
  * ==========================================================================
  * The first-fit block allocator
@@ -310,6 +311,7 @@ static space_map_ops_t metaslab_ff_ops = {
 	metaslab_ff_free,
 	NULL	/* maxsize */
 };
+#endif
 
 /*
  * Dynamic block allocator -

module/zfs/spa.c

@@ -1138,6 +1138,8 @@ int
 spa_check_logs(spa_t *spa)
 {
 	switch (spa->spa_log_state) {
+	default:
+		break;
 	case SPA_LOG_MISSING:
 		/* need to recheck in case slog has been restored */
 	case SPA_LOG_UNKNOWN: