fixup rebase

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

Author: Paul Dagnelie

include/sys/metaslab.h

@@ -83,8 +83,8 @@ uint64_t metaslab_largest_allocatable(metaslab_t *);
 int metaslab_alloc(spa_t *, metaslab_class_t *, uint64_t, blkptr_t *, int,
     uint64_t, blkptr_t *, int, zio_alloc_list_t *, int, const void *);
 int metaslab_alloc_range(spa_t *, metaslab_class_t *, uint64_t, uint64_t,
-    blkptr_t *, int, uint64_t, blkptr_t *, int, zio_alloc_list_t *, zio_t *,
-    int, uint64_t *);
+    blkptr_t *, int, uint64_t, blkptr_t *, int, zio_alloc_list_t *,
+    int, const void *, uint64_t *);
 int metaslab_alloc_dva(spa_t *, metaslab_class_t *, uint64_t,
     dva_t *, int, dva_t *, uint64_t, int, zio_alloc_list_t *, int);
 void metaslab_free(spa_t *, const blkptr_t *, uint64_t, boolean_t);
@@ -131,8 +131,8 @@ uint64_t metaslab_group_get_space(metaslab_group_t *);
 void metaslab_group_histogram_verify(metaslab_group_t *);
 uint64_t metaslab_group_fragmentation(metaslab_group_t *);
 void metaslab_group_histogram_remove(metaslab_group_t *, metaslab_t *);
-void metaslab_group_alloc_increment_all(spa_t *, blkptr_t *, const void *,
-    int, int);
+void metaslab_group_alloc_increment_all(spa_t *, blkptr_t *, int, int,
+    uint64_t, const void *);
 void metaslab_group_alloc_decrement(spa_t *, uint64_t, int, int, uint64_t,
     const void *);
 void metaslab_recalculate_weight_and_sort(metaslab_t *);

module/zfs/metaslab.c

@@ -4759,13 +4759,13 @@ metaslab_group_alloc_increment(spa_t *spa, uint64_t vdev, int allocator,
 }
 
 void
-metaslab_group_alloc_increment_all(spa_t *spa, blkptr_t *bp, const void *tag,
-    int flags, int allocator)
+metaslab_group_alloc_increment_all(spa_t *spa, blkptr_t *bp, int allocator,
+    int flags, uint64_t psize, const void *tag)
 {
 	for (int d = 0; d < BP_GET_NDVAS(bp); d++) {
 		uint64_t vdev = DVA_GET_VDEV(&bp->blk_dva[d]);
-		metaslab_group_alloc_increment(spa, vdev, tag, flags,
-		    allocator);
+		metaslab_group_alloc_increment(spa, vdev, allocator, flags,
+		    psize, tag);
 	}
 }
 
@@ -5925,14 +5925,14 @@ metaslab_alloc(spa_t *spa, metaslab_class_t *mc, uint64_t psize, blkptr_t *bp,
     zio_alloc_list_t *zal, int allocator, const void *tag)
 {
 	return (metaslab_alloc_range(spa, mc, psize, psize, bp, ndvas, txg,
-	    hintbp, flags, zal, zio, allocator, NULL));
+	    hintbp, flags, zal, allocator, tag, NULL));
 }
 
 int
 metaslab_alloc_range(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
     uint64_t max_psize, blkptr_t *bp, int ndvas, uint64_t txg,
     blkptr_t *hintbp, int flags, zio_alloc_list_t *zal, 
-    int allocator, zio_t *zio, uint64_t *actual_psize)
+    int allocator, const void *tag, uint64_t *actual_psize)
 {
 	dva_t *dva = bp->blk_dva;
 	dva_t *hintdva = (hintbp != NULL) ? hintbp->blk_dva : NULL;

module/zfs/zio.c

@@ -3252,8 +3252,8 @@ zio_write_gang_block(zio_t *pio, metaslab_class_t *mc)
 		zio_gang_inherit_allocator(zio, cio);
 		if (allocated) {
 			metaslab_trace_move(&cio_list, &cio->io_alloc_list);
-			metaslab_group_alloc_increment_all(spa, bp, cio, flags,
-			    zio->io_allocator);
+			metaslab_group_alloc_increment_all(spa, bp,
+			    zio->io_allocator, flags, psize, cio);
 		}
 		/*
 		 * We do not reserve for the child writes, since we already

tests/zfs-tests/tests/functional/gang_blocks/gang_blocks_001_pos.ksh

@@ -40,7 +40,7 @@ set_tunable32 METASLAB_FORCE_GANGING_PCT 100
 path="${mountpoint}/file"
 log_must dd if=/dev/urandom of=$path bs=128k count=1
 log_must zpool sync $TESTPOOL
-first_block=$(get_first_block $TESTPOOL/$TESTFS file)
+first_block=$(get_first_block_dva $TESTPOOL/$TESTFS file)
 leaves=$(read_gang_header $TESTPOOL $first_block 200 | grep -v hole | wc -l)
 [[ "$leaves" -gt 1 ]] || log_fail "Only one leaf in gang block, should not be possible"