From 9cab99bae8f4643c949d6121c14e12a19c2608a3 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 21 Nov 2023 13:44:40 -0500 Subject: [PATCH] crush: remove unused variables [161/715] Building CXX object src/crush/CMakeFiles/crush_objs.dir/CrushTester.cc.o ceph/src/crush/CrushTester.cc:478:7: warning: variable 'num_devices_active' set but not used [-Wunused-but-set-variable] int num_devices_active = 0; ^ 1 warning generated. [165/715] Building CXX object src/crush/CMakeFiles/crush_objs.dir/CrushWrapper.cc.o ceph/src/crush/CrushWrapper.cc:1579:9: warning: variable 'local_changed' set but not used [-Wunused-but-set-variable] int local_changed = 0; ^ Signed-off-by: Casey Bodley --- src/crush/CrushTester.cc | 6 ------ src/crush/CrushWrapper.cc | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc index 4f99cffaaa9..1d659e6a56b 100644 --- a/src/crush/CrushTester.cc +++ b/src/crush/CrushTester.cc @@ -474,12 +474,6 @@ int CrushTester::test(CephContext* cct) // make adjustments adjust_weights(weight); - - int num_devices_active = 0; - for (vector<__u32>::iterator p = weight.begin(); p != weight.end(); ++p) - if (*p > 0) - num_devices_active++; - if (output_choose_tries) crush.start_choose_profile(); diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index 530c2413933..0f40e6875e1 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -1576,13 +1576,11 @@ int CrushWrapper::adjust_subtree_weight(CephContext *cct, int id, int weight, while (!q.empty()) { b = q.front(); q.pop_front(); - int local_changed = 0; for (unsigned i=0; isize; ++i) { int n = b->items[i]; if (n >= 0) { adjust_item_weight_in_bucket(cct, n, weight, b->id, update_weight_sets); ++changed; - ++local_changed; } else { crush_bucket *sub = get_bucket(n); if (IS_ERR(sub)) -- 2.39.5