Alexander's feedback

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

Author: Paul Dagnelie

module/zfs/metaslab.c

@@ -5958,7 +5958,8 @@ metaslab_alloc_range(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
 
 	for (int d = 0; d < ndvas; d++) {
 		error = metaslab_alloc_dva_range(spa, mc, psize, max_psize,
-		    dva, d, hintdva, txg, flags, zal, allocator, &cur_psize);
+		    dva, d, hintdva, txg, flags, zal, allocator,
+		    actual_psize ? &cur_psize : NULL);
 		if (error != 0) {
 			for (d--; d >= 0; d--) {
 				metaslab_unalloc_dva(spa, &dva[d], txg);
@@ -5977,14 +5978,16 @@ metaslab_alloc_range(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
 			metaslab_group_alloc_increment(spa,
 			    DVA_GET_VDEV(&dva[d]), allocator, flags, psize,
 			    tag);
-			min_psize = MIN(cur_psize, min_psize);
+			if (actual_psize)
+				min_psize = MIN(cur_psize, min_psize);
 		}
 	}
 	ASSERT(error == 0);
 	ASSERT(BP_GET_NDVAS(bp) == ndvas);
-	ASSERT3U(min_psize, !=, UINT64_MAX);
-	if (actual_psize)
+	if (actual_psize) {
+		ASSERT3U(min_psize, !=, UINT64_MAX);
 		*actual_psize = min_psize;
+	}
 
 	spa_config_exit(spa, SCL_ALLOC, FTAG);
 

module/zfs/vdev_raidz.c

@@ -2257,7 +2257,7 @@ vdev_raidz_asize_to_psize(vdev_t *vd, uint64_t asize, uint64_t txg)
 	ASSERT0(asize % (1 << ashift));
 
 	psize = (asize >> ashift);
-	psize -= nparity * ((asize + cols - nparity - 1) / (cols - nparity));
+	psize -= nparity * DIV_ROUND_UP(psize, cols);
 	psize <<= ashift;
 
 	return (asize);