diff options
| author | Matthew Macy <[email protected]> | 2019-12-05 12:37:00 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-12-05 12:37:00 -0800 |
| commit | 2a8ba608d3eace43010174aa4f67c8b8af4aacf3 (patch) | |
| tree | b6393b38c9f31ee69fac7f42414b09ca900f2737 /cmd | |
| parent | 12395c7b0bbd2eaaae96d4105bdc83c3d0c73bec (diff) | |
Replace ASSERTV macro with compiler annotation
Remove the ASSERTV macro and handle suppressing unused
compiler warnings for variables only in ASSERTs using the
__attribute__((unused)) compiler annotation. The annotation
is understood by both gcc and clang.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Jorgen Lundman <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9671
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/zdb/zdb.c | 2 | ||||
| -rw-r--r-- | cmd/ztest/ztest.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index 3cdd7f2c1..e4c8861eb 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -4664,7 +4664,7 @@ zdb_leak_fini(spa_t *spa, zdb_cb_t *zcb) vdev_t *rvd = spa->spa_root_vdev; for (unsigned c = 0; c < rvd->vdev_children; c++) { vdev_t *vd = rvd->vdev_child[c]; - ASSERTV(metaslab_group_t *mg = vd->vdev_mg); + metaslab_group_t *mg __maybe_unused = vd->vdev_mg; if (zcb->zcb_vd_obsolete_counts[c] != NULL) { leaks |= zdb_check_for_obsolete_leaks(vd, zcb); diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index dbc5084d0..e4b0f61f8 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -3607,7 +3607,7 @@ ztest_device_removal(ztest_ds_t *zd, uint64_t id) vdev_t * grow_vdev(vdev_t *vd, void *arg) { - ASSERTV(spa_t *spa = vd->vdev_spa); + spa_t *spa __maybe_unused = vd->vdev_spa; size_t *newsize = arg; size_t fsize; int fd; |