From c29e7898a9dda5a9217ec0096336fc1a3a6466ad Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Wed, 29 Aug 2018 13:25:20 -0400 Subject: [PATCH] crush: Quell unused variable warnings Signed-off-by: Adam C. Emerson --- src/crush/CrushWrapper.cc | 4 ++-- src/crush/builder.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index c1cbc2936aa9f..f5585a1bb106c 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -1062,8 +1062,8 @@ int CrushWrapper::insert_item( ldout(cct, 5) << "insert_item adding " << cur << " weight " << weight << " to bucket " << id << dendl; - int r = bucket_add_item(b, cur, 0); - assert (!r); + [[maybe_unused]] int r = bucket_add_item(b, cur, 0); + ceph_assert(!r); break; } diff --git a/src/crush/builder.c b/src/crush/builder.c index be8b5e24cebca..53a6e1b91ef64 100644 --- a/src/crush/builder.c +++ b/src/crush/builder.c @@ -1426,10 +1426,10 @@ struct crush_choose_arg *crush_make_choose_args(struct crush_map *map, int num_p struct crush_choose_arg *arg = (struct crush_choose_arg *)space; struct crush_weight_set *weight_set = (struct crush_weight_set *)(arg + map->max_buckets); __u32 *weights = (__u32 *)(weight_set + bucket_count * num_positions); - char *weight_set_ends = (char*)weights; + char *weight_set_ends __attribute__((unused)) = (char*)weights; __s32 *ids = (__s32 *)(weights + sum_bucket_size * num_positions); - char *weights_end = (char *)ids; - char *ids_end = (char *)(ids + sum_bucket_size); + char *weights_end __attribute__((unused)) = (char *)ids; + char *ids_end __attribute__((unused)) = (char *)(ids + sum_bucket_size); BUG_ON(space + size != ids_end); for (b = 0; b < map->max_buckets; b++) { if (map->buckets[b] == 0) { -- 2.39.5