From 67c05144bb64b76e55ad2063a272f96606e7c063 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 21 Sep 2018 18:49:17 +0800 Subject: [PATCH] osd/PG.cc: silence "-Wsign-compare" warnings /ceph/src/osd/PG.cc: In member function 'void PG::choose_async_recovery_ec(const std::map&, const pg_info_t&, std::vector*, std::set*) const': /ceph/src/osd/PG.cc:1572:32: warning: comparison of integer expressions of different signedness: 'long int' and 'long unsigned int' [-Wsign-compare] if (approx_missing_objects > cct->_conf.get_val( ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "osd_async_recovery_min_cost")) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /ceph/src/osd/PG.cc: In member function 'void PG::choose_async_recovery_replicated(const std::map&, const pg_info_t&, std::vector*, std::set*) const': /ceph/src/osd/PG.cc:1625:33: warning: comparison of integer expressions of different signedness: 'long int' and 'long unsigned int' [-Wsign-compare] if (approx_missing_objects > cct->_conf.get_val( ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "osd_async_recovery_min_cost")) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Kefu Chai --- src/osd/PG.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index ea9ba4660aec6..2791bd3d572cb 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -1569,8 +1569,8 @@ void PG::choose_async_recovery_ec(const map &all_info, if (auth_version > candidate_version) { approx_missing_objects += auth_version - candidate_version; } - if (approx_missing_objects > cct->_conf.get_val( - "osd_async_recovery_min_cost")) { + if (static_cast(approx_missing_objects) > + cct->_conf.get_val("osd_async_recovery_min_cost")) { candidates_by_cost.insert(make_pair(approx_missing_objects, shard_i)); } } @@ -1622,8 +1622,8 @@ void PG::choose_async_recovery_replicated(const map &all_ } else { approx_missing_objects += candidate_version - auth_version; } - if (approx_missing_objects > cct->_conf.get_val( - "osd_async_recovery_min_cost")) { + if (static_cast(approx_missing_objects) > + cct->_conf.get_val("osd_async_recovery_min_cost")) { candidates_by_cost.insert(make_pair(approx_missing_objects, shard_i)); } } -- 2.39.5