Feedback part 1

Signed-off-by: Paul Dagnelie <paul.dagnelie@klarasystems.com>

Author: Paul Dagnelie

module/zfs/metaslab.c

@@ -1734,8 +1734,8 @@ metaslab_block_picker(zfs_range_tree_t *rt, uint64_t *cursor, uint64_t size,
 		*cursor = rt->rt_start;
 	zfs_btree_t *bt = &rt->rt_root;
 	zfs_btree_index_t where;
-	zfs_range_seg_t *rs = metaslab_block_find(bt, rt, *cursor, size, size,
-	    &where);
+	zfs_range_seg_t *rs = metaslab_block_find(bt, rt, *cursor, size,
+	    max_size, &where);
 	uint64_t first_found;
 	int count_searched = 0;
 
@@ -1885,7 +1885,7 @@ metaslab_df_alloc(metaslab_t *msp, uint64_t size, uint64_t max_size,
 			align = size & -size;
 			cursor = &msp->ms_lbas[highbit64(align) - 1];
 			offset = metaslab_block_picker(rt, cursor, size,
-			    size, metaslab_df_max_search, found_size);
+			    max_size, metaslab_df_max_search, found_size);
 		}
 	}
 
@@ -5164,16 +5164,17 @@ metaslab_group_alloc(metaslab_group_t *mg, zio_alloc_list_t *zal,
 
 		offset = metaslab_block_alloc(msp, asize, max_asize, txg,
 		    actual_asize);
-		metaslab_trace_add(zal, mg, msp, *actual_asize, d, offset,
-		    allocator);
 
 		if (offset != -1ULL) {
+			metaslab_trace_add(zal, mg, msp, *actual_asize, d,
+			    offset, allocator);
 			/* Proactively passivate the metaslab, if needed */
 			if (activated)
 				metaslab_segment_may_passivate(msp);
 			mutex_exit(&msp->ms_lock);
 			break;
 		}
+		metaslab_trace_add(zal, mg, msp, asize, d, offset, allocator);
 next:
 		ASSERT(msp->ms_loaded);
 
@@ -5399,10 +5400,11 @@ metaslab_alloc_dva_range(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
 		uint64_t offset = metaslab_group_alloc(mg, zal, asize,
 		    max_asize, txg, dva, d, allocator, try_hard,
 		    &asize);
-		if (actual_psize)
-			*actual_psize = vdev_asize_to_psize_txg(vd, asize, txg);
 
 		if (offset != -1ULL) {
+			if (actual_psize)
+				*actual_psize = vdev_asize_to_psize_txg(vd,
+				    asize, txg);
 			metaslab_class_rotate(mg, allocator, psize, B_TRUE);
 
 			DVA_SET_VDEV(&dva[d], vd->vdev_id);

module/zfs/zio.c

@@ -3200,7 +3200,7 @@ zio_write_gang_block(zio_t *pio, metaslab_class_t *mc)
 	/*
 	 * Create and nowait the gang children. First, we try to do
 	 * opportunistic allocations. If that fails to generate enough
-	 * space, we fall back to normal zio_write calls.
+	 * space, we fall back to normal zio_write calls for nested gang.
 	 */
 	for (int g = 0; resid != 0; g++) {
 		flags &= METASLAB_ASYNC_ALLOC;
@@ -3236,7 +3236,7 @@ zio_write_gang_block(zio_t *pio, metaslab_class_t *mc)
 		    bp, gio->io_prop.zp_copies, txg, NULL,
 		    flags, &cio_list, zio->io_allocator, NULL, &allocated_size);
 
-		boolean_t allocated = allocated_size != UINT64_MAX;
+		boolean_t allocated = error == 0;
 
 		uint64_t psize = allocated ? MIN(resid, allocated_size) :
 		    min_size;
@@ -4964,7 +4964,6 @@ zio_checksum_generate(zio_t *zio)
 		ASSERT(checksum == ZIO_CHECKSUM_LABEL);
 	} else {
 		if (BP_IS_GANG(bp) && zio->io_child_type == ZIO_CHILD_GANG) {
-			zfs_dbgmsg("gang: %px", zio);
 			ASSERT(!IO_IS_ALLOCATING(zio));
 			checksum = ZIO_CHECKSUM_GANG_HEADER;
 		} else {