From: Kefu Chai <kchai@redhat.com>
Date: Tue, 27 Apr 2021 12:37:32 +0000 (+0800)
Subject: librbd: use uint64 for return value of size()
X-Git-Tag: v17.1.0~2097^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef12761bdb03f99aa45ba091bd66a1ab3228c5a2;p=ceph.git

librbd: use uint64 for return value of size()

size_t is not necessarily an alias of uint64_t, so template argument
deduction would fail if we use `std::min(m_object_map.size(),
prev_object_diff_state_size)`. so better off using the same type for lhs
and rhs.

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

diff --git a/src/librbd/object_map/DiffRequest.cc b/src/librbd/object_map/DiffRequest.cc
index a8331bc5afc4..ca341f78c2f2 100644
--- a/src/librbd/object_map/DiffRequest.cc
+++ b/src/librbd/object_map/DiffRequest.cc
@@ -175,7 +175,7 @@ void DiffRequest<I>::handle_load_object_map(int r) {
     m_object_map.resize(num_objs);
   }
 
-  size_t prev_object_diff_state_size = m_object_diff_state->size();
+  uint64_t prev_object_diff_state_size = m_object_diff_state->size();
   if (prev_object_diff_state_size < num_objs) {
     // the diff state should be the largest of all snapshots in the set
     m_object_diff_state->resize(num_objs);