mav's feedback

Signed-off-by: Paul Dagnelie <[email protected]>

Author: Paul Dagnelie

module/zfs/zio.c

@@ -3128,8 +3128,7 @@ zio_write_gang_member_ready(zio_t *zio)
 	for (int d = 0; d < BP_GET_NDVAS(pio->io_bp); d++) {
 		ASSERT(DVA_GET_GANG(&pdva[d]));
 		asize = DVA_GET_ASIZE(&pdva[d]);
-		for (int cd = 0; cd < BP_GET_NDVAS(zio->io_bp); cd++)
-			asize += DVA_GET_ASIZE(&cdva[cd]);
+		asize += DVA_GET_ASIZE(&cdva[d]);
 		DVA_SET_ASIZE(&pdva[d], asize);
 	}
 	mutex_exit(&pio->io_lock);

module/zfs/zio_checksum.c

@@ -545,15 +545,16 @@ zio_checksum_error(zio_t *zio, zio_bad_cksum_t *info)
 	uint_t checksum = (bp == NULL ? zio->io_prop.zp_checksum :
 	    (BP_IS_GANG(bp) ? ZIO_CHECKSUM_GANG_HEADER : BP_GET_CHECKSUM(bp)));
 	int error;
-	uint64_t size = bp == NULL ? zio->io_size :
-	    (BP_IS_GANG(bp) ? SPA_OLD_GANGBLOCKSIZE : BP_GET_PSIZE(bp));
+	uint64_t size = bp ? BP_GET_PSIZE(bp) : zio->io_size;
 	uint64_t offset = zio->io_offset;
 	abd_t *data = zio->io_abd;
 	spa_t *spa = zio->io_spa;
 
-	if (bp && BP_IS_GANG(bp) && spa_feature_is_active(spa,
-	    SPA_FEATURE_DYNAMIC_GANG_HEADER)) {
-		size = zio->io_size;
+	if (bp && BP_IS_GANG(bp)) {
+		if (spa_feature_is_active(spa, SPA_FEATURE_DYNAMIC_GANG_HEADER))
+			size = zio->io_size;
+		else
+			size = SPA_OLD_GANGBLOCKSIZE;
 	}
 
 	error = zio_checksum_error_impl(spa, bp, checksum, data, size,