From ef12761bdb03f99aa45ba091bd66a1ab3228c5a2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 27 Apr 2021 20:37:32 +0800 Subject: [PATCH] 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 --- src/librbd/object_map/DiffRequest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librbd/object_map/DiffRequest.cc b/src/librbd/object_map/DiffRequest.cc index a8331bc5afc..ca341f78c2f 100644 --- a/src/librbd/object_map/DiffRequest.cc +++ b/src/librbd/object_map/DiffRequest.cc @@ -175,7 +175,7 @@ void DiffRequest::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); -- 2.47.3