From: Ceph Packaging Team <team+ceph@tracker.debian.org>
Date: Thu, 3 Dec 2020 20:03:06 +0000 (+0000)
Subject: mds-purgequeue-use_uint64_t
X-Git-Tag: archive/raspbian/14.2.15-3+rpi1~1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2df8a5c6ac43aa4489107f5156947faee26280e5;p=ceph.git

mds-purgequeue-use_uint64_t

===================================================================

Gbp-Pq: Name mds-purgequeue-use_uint64_t.patch
---

diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index cc30d9d21..8cbc42743 100644
--- a/src/mds/PurgeQueue.cc
+++ b/src/mds/PurgeQueue.cc
@@ -499,7 +499,7 @@ void PurgeQueue::_execute_item(
 
   in_flight[expire_to] = item;
   logger->set(l_pq_executing, in_flight.size());
-  files_high_water = std::max(files_high_water, in_flight.size());
+  files_high_water = std::max(files_high_water, static_cast<uint64_t>(in_flight.size()));
   logger->set(l_pq_executing_high_water, files_high_water);
   auto ops = _calculate_ops(item);
   ops_in_flight += ops;
@@ -577,7 +577,7 @@ void PurgeQueue::_execute_item(
     logger->set(l_pq_executing_ops_high_water, ops_high_water);
     in_flight.erase(expire_to);
     logger->set(l_pq_executing, in_flight.size());
-    files_high_water = std::max(files_high_water, in_flight.size());
+    files_high_water = std::max(files_high_water, static_cast<uint64_t>(in_flight.size()));
     logger->set(l_pq_executing_high_water, files_high_water);
     return;
   }
@@ -654,7 +654,7 @@ void PurgeQueue::_execute_item_complete(
 
   in_flight.erase(iter);
   logger->set(l_pq_executing, in_flight.size());
-  files_high_water = std::max(files_high_water, in_flight.size());
+  files_high_water = std::max(files_high_water, static_cast<uint64_t>(in_flight.size()));
   logger->set(l_pq_executing_high_water, files_high_water);
   dout(10) << "in_flight.size() now " << in_flight.size() << dendl;