From: Kefu Chai <kchai@redhat.com>
Date: Fri, 21 Sep 2018 10:49:17 +0000 (+0800)
Subject: osd/PG.cc: silence "-Wsign-compare" warnings
X-Git-Tag: v14.0.1~205^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24217%2Fhead;p=ceph.git

osd/PG.cc: silence "-Wsign-compare" warnings

/ceph/src/osd/PG.cc: In member function 'void
PG::choose_async_recovery_ec(const std::map<pg_shard_t, pg_info_t>&,
const pg_info_t&, std::vector<int>*, std::set<pg_shard_t>*) 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<uint64_t>(
         ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         "osd_async_recovery_min_cost")) {
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/ceph/src/osd/PG.cc: In member function 'void
PG::choose_async_recovery_replicated(const std::map<pg_shard_t,
pg_info_t>&, const pg_info_t&, std::vector<int>*, std::set<pg_shard_t>*)
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<uint64_t>(
         ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         "osd_async_recovery_min_cost")) {
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index ea9ba4660aec..2791bd3d572c 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1569,8 +1569,8 @@ void PG::choose_async_recovery_ec(const map<pg_shard_t, pg_info_t> &all_info,
     if (auth_version > candidate_version) {
       approx_missing_objects += auth_version - candidate_version;
     }
-    if (approx_missing_objects > cct->_conf.get_val<uint64_t>(
-        "osd_async_recovery_min_cost")) {
+    if (static_cast<uint64_t>(approx_missing_objects) >
+	cct->_conf.get_val<uint64_t>("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<pg_shard_t, pg_info_t> &all_
     } else {
       approx_missing_objects += candidate_version - auth_version;
     }
-    if (approx_missing_objects  > cct->_conf.get_val<uint64_t>(
-        "osd_async_recovery_min_cost")) {
+    if (static_cast<uint64_t>(approx_missing_objects)  >
+	cct->_conf.get_val<uint64_t>("osd_async_recovery_min_cost")) {
       candidates_by_cost.insert(make_pair(approx_missing_objects, shard_i));
     }
   }