From 3df0c2fa32a37fbb95f32de20e737fdf65ec0f5b Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Mon, 17 Aug 2020 18:40:17 -0400 Subject: FreeBSD: fix the build with Clang 11 * Cast void * to uintptr_t before casting to boolean_t. * Avoid clashing definition of __asm when not on Linux to prevent duplicate __volatile__. This was already done in some places but not all. Reviewed-by: Brian Behlendorf Reviewed-by: Matt Macy Signed-off-by: Ryan Moeller Closes #10723 --- module/zfs/dsl_dataset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/zfs/dsl_dataset.c') diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index aac8bf76e..c5143ac5a 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -1020,7 +1020,7 @@ zfeature_active(spa_feature_t f, void *arg) { switch (spa_feature_table[f].fi_type) { case ZFEATURE_TYPE_BOOLEAN: { - boolean_t val = (boolean_t)arg; + boolean_t val = (boolean_t)(uintptr_t)arg; ASSERT(val == B_FALSE || val == B_TRUE); return (val); } @@ -1076,7 +1076,7 @@ dsl_dataset_activate_feature(uint64_t dsobj, spa_feature_t f, void *arg, switch (spa_feature_table[f].fi_type) { case ZFEATURE_TYPE_BOOLEAN: - ASSERT3S((boolean_t)arg, ==, B_TRUE); + ASSERT3S((boolean_t)(uintptr_t)arg, ==, B_TRUE); VERIFY0(zap_add(mos, dsobj, spa_feature_table[f].fi_guid, sizeof (zero), 1, &zero, tx)); break; -- cgit v1.2.3