import 15.2.0 Octopus source

[ceph.git] / ceph / src / librbd / object_map / ResizeRequest.cc

diff --git a/ceph/src/librbd/object_map/ResizeRequest.cc b/ceph/src/librbd/object_map/ResizeRequest.cc
index 1ec0d99afad2efd0257b260c682462fa5ebd2aca..89e39b670d8a5f8301df7c3ac2144d61e39b19bb 100644 (file)
--- a/ceph/src/librbd/object_map/ResizeRequest.cc
+++ b/ceph/src/librbd/object_map/ResizeRequest.cc
@@ -32,7 +32,7 @@ void ResizeRequest::resize(ceph::BitVector<2> *object_map, uint64_t num_objs,
 void ResizeRequest::send() {
   CephContext *cct = m_image_ctx.cct;
 
-  RWLock::WLocker l(m_image_ctx.object_map_lock);
+  std::unique_lock l{*m_object_map_lock};
   m_num_objs = Striper::get_num_objects(m_image_ctx.layout, m_new_size);
 
   std::string oid(ObjectMap<>::object_map_name(m_image_ctx.id, m_snap_id));
@@ -53,12 +53,11 @@ void ResizeRequest::send() {
 }
 
 void ResizeRequest::finish_request() {
-  RWLock::WLocker object_map_locker(m_image_ctx.object_map_lock);
-
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 5) << this << " resizing in-memory object map: "
                << m_num_objs << dendl;
 
+  std::unique_lock object_map_locker{*m_object_map_lock};
   resize(m_object_map, m_num_objs, m_default_object_state);
 }