diff options
| author | Ryan Moeller <[email protected]> | 2020-08-17 18:40:17 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-17 15:40:17 -0700 |
| commit | 3df0c2fa32a37fbb95f32de20e737fdf65ec0f5b (patch) | |
| tree | d1b395052599a4df0c5f2674d03136081d12d6b4 /module/zfs/dsl_dataset.c | |
| parent | cfdc432e644912bbd7e026110ee57cc0f22ec321 (diff) | |
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 <[email protected]>
Reviewed-by: Matt Macy <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #10723
Diffstat (limited to 'module/zfs/dsl_dataset.c')
| -rw-r--r-- | module/zfs/dsl_dataset.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |