Alexander feedback

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

Author: Paul Dagnelie

include/sys/ddt.h

@@ -352,8 +352,8 @@ extern ddt_phys_variant_t ddt_phys_select(const ddt_t *ddt,
     const ddt_entry_t *dde, const blkptr_t *bp);
 extern uint64_t ddt_phys_birth(const ddt_univ_phys_t *ddp,
     ddt_phys_variant_t v);
-extern int ddt_phys_gang_count(const ddt_univ_phys_t *ddp,
-    ddt_phys_variant_t v, boolean_t encrypted);
+extern int ddt_phys_is_gang(const ddt_univ_phys_t *ddp,
+    ddt_phys_variant_t v);
 extern int ddt_phys_dva_count(const ddt_univ_phys_t *ddp, ddt_phys_variant_t v,
     boolean_t encrypted);
 

module/zfs/ddt.c

@@ -815,17 +815,14 @@ ddt_phys_birth(const ddt_univ_phys_t *ddp, ddt_phys_variant_t v)
 }
 
 int
-ddt_phys_gang_count(const ddt_univ_phys_t *ddp, ddt_phys_variant_t v,
-    boolean_t encrypted)
+ddt_phys_is_gang(const ddt_univ_phys_t *ddp, ddt_phys_variant_t v)
 {
 	ASSERT3U(v, <, DDT_PHYS_NONE);
 
 	const dva_t *dvas = (v == DDT_PHYS_FLAT) ?
 	    ddp->ddp_flat.ddp_dva : ddp->ddp_trad[v].ddp_dva;
 
-	return (DVA_GET_GANG(&dvas[0]) +
-	    DVA_GET_GANG(&dvas[1] +
-	    DVA_GET_GANG(&dvas[2]) * !encrypted));
+	return (DVA_GET_GANG(&dvas[0]));
 }
 
 int

module/zfs/zio.c

@@ -3795,7 +3795,7 @@ zio_ddt_write(zio_t *zio)
 	 */
 	int have_dvas = ddt_phys_dva_count(ddp, v, BP_IS_ENCRYPTED(bp));
 	IMPLY(have_dvas == 0, ddt_phys_birth(ddp, v) == 0);
-	int gang_dvas = ddt_phys_gang_count(ddp, v, BP_IS_ENCRYPTED(bp));
+	boolean_t is_ganged = ddt_phys_is_gang(ddp, v);
 
 	/* Number of DVAs requested by the IO. */
 	uint8_t need_dvas = zp->zp_copies;
@@ -3943,7 +3943,7 @@ zio_ddt_write(zio_t *zio)
 		need_dvas -= parent_dvas;
 	}
 
-	if (gang_dvas > 0 && have_dvas > 0) {
+	if (is_ganged) {
 		zp->zp_dedup = B_FALSE;
 		BP_SET_DEDUP(bp, B_FALSE);
 		zio->io_pipeline = ZIO_WRITE_PIPELINE;
@@ -3957,7 +3957,7 @@ zio_ddt_write(zio_t *zio)
 	 * grow the DDT entry by to satisfy the request.
 	 */
 	zio_prop_t czp = *zp;
-	if (gang_dvas == 0 && have_dvas > 0) {
+	if (have_dvas > 0) {
 		czp.zp_copies = need_dvas;
 		czp.zp_gang_copies = 0;
 	} else {