Skip to content

Commit c3b8110

Browse files
author
Paul Dagnelie
committed
Fix test failures
Signed-off-by: Paul Dagnelie <[email protected]>
1 parent 8fc80cf commit c3b8110

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

cmd/zdb/zdb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9114,7 +9114,8 @@ zdb_read_block(char *thing, spa_t *spa)
91149114

91159115
if ((zio_checksum_table[ck].ci_flags &
91169116
ZCHECKSUM_FLAG_EMBEDDED) ||
9117-
ck == ZIO_CHECKSUM_NOPARITY) {
9117+
ck == ZIO_CHECKSUM_NOPARITY ||
9118+
ck == ZIO_CHECKSUM_ANYRAID_MAP) {
91189119
continue;
91199120
}
91209121
BP_SET_CHECKSUM(bp, ck);

lib/libzfs/libzfs.abi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@
639639
<elf-symbol name='fletcher_4_superscalar_ops' size='128' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
640640
<elf-symbol name='libzfs_config_ops' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
641641
<elf-symbol name='sa_protocol_names' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
642-
<elf-symbol name='spa_feature_table' size='2632' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
642+
<elf-symbol name='spa_feature_table' size='2688' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
643643
<elf-symbol name='zfeature_checks_disable' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
644644
<elf-symbol name='zfs_deleg_perm_tab' size='528' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
645645
<elf-symbol name='zfs_history_event_names' size='328' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -9619,8 +9619,8 @@
96199619
</function-decl>
96209620
</abi-instr>
96219621
<abi-instr address-size='64' path='module/zcommon/zfeature_common.c' language='LANG_C99'>
9622-
<array-type-def dimensions='1' type-id='83f29ca2' size-in-bits='21056' id='fd43354e'>
9623-
<subrange length='47' type-id='7359adad' id='8f8900fe'/>
9622+
<array-type-def dimensions='1' type-id='83f29ca2' size-in-bits='21504' id='bd288d11'>
9623+
<subrange length='48' type-id='7359adad' id='8f6d2a81'/>
96249624
</array-type-def>
96259625
<enum-decl name='zfeature_flags' id='6db816a4'>
96269626
<underlying-type type-id='9cac1fee'/>
@@ -9698,7 +9698,7 @@
96989698
<pointer-type-def type-id='611586a1' size-in-bits='64' id='2e243169'/>
96999699
<qualified-type-def type-id='eaa32e2f' const='yes' id='83be723c'/>
97009700
<pointer-type-def type-id='83be723c' size-in-bits='64' id='7acd98a2'/>
9701-
<var-decl name='spa_feature_table' type-id='fd43354e' mangled-name='spa_feature_table' visibility='default' elf-symbol-id='spa_feature_table'/>
9701+
<var-decl name='spa_feature_table' type-id='bd288d11' mangled-name='spa_feature_table' visibility='default' elf-symbol-id='spa_feature_table'/>
97029702
<var-decl name='zfeature_checks_disable' type-id='c19b74c3' mangled-name='zfeature_checks_disable' visibility='default' elf-symbol-id='zfeature_checks_disable'/>
97039703
<function-decl name='opendir' visibility='default' binding='global' size-in-bits='64'>
97049704
<parameter type-id='80f4b756'/>

tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ DISK2="$(echo $DISKS | cut -d' ' -f2)"
3939
for type in "mirror" "anyraid1"; do
4040
log_must zpool create -f $TESTPOOL $type $DISK1 $DISK2
4141
if [[ "$type" == "anyraid1" ]]; then
42-
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=3k
42+
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=2k
4343
log_must zpool sync
4444
log_must rm /$TESTPOOL/f1
4545
fi

tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_start_and_cancel_neg.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ for type in "" "anyraid2"; do
4949
log_must zpool list -v
5050
log_must zpool create -f $TESTPOOL $type $DISK1 $DISK2 $DISK3
5151
if [[ "$type" == "anyraid2" ]]; then
52-
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=3k
52+
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=2k
5353
log_must zpool sync
5454
log_must rm /$TESTPOOL/f1
5555
fi

tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_uninit.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ for type in "" "anyraid1"; do
8585
log_must zpool create -f $TESTPOOL $type $DISK1 $DISK2 $DISK3
8686
status_check_all $TESTPOOL "uninitialized"
8787
if [[ "$type" == "anyraid1" ]]; then
88-
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=4k
88+
log_must dd if=/dev/urandom of=/$TESTPOOL/f1 bs=1M count=2k
8989
log_must zpool sync
9090
log_must rm /$TESTPOOL/f1
9191
fi

0 commit comments

Comments
 (0)