From 57537d92f8e224c8c5beaa129710f89c2937d3d8 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 18 Feb 2019 11:55:55 +0100
Subject: [PATCH] librbd: CopyupRequest::m_pending_copyups doesn't need to be
 atomic

It's protected by CopyupRequest::m_lock mutex.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
 src/librbd/io/CopyupRequest.cc | 2 +-
 src/librbd/io/CopyupRequest.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librbd/io/CopyupRequest.cc b/src/librbd/io/CopyupRequest.cc
index dddaa369fc8..334f0ec4162 100644
--- a/src/librbd/io/CopyupRequest.cc
+++ b/src/librbd/io/CopyupRequest.cc
@@ -282,7 +282,7 @@ bool CopyupRequest<I>::should_complete(int *r) {
   ldout(cct, 20) << "oid " << m_oid
                  << ", r " << *r << dendl;
 
-  uint64_t pending_copyups;
+  unsigned pending_copyups;
   switch (m_state) {
   case STATE_READ_FROM_PARENT:
     ldout(cct, 20) << "READ_FROM_PARENT" << dendl;
diff --git a/src/librbd/io/CopyupRequest.h b/src/librbd/io/CopyupRequest.h
index fba71202372..d091e877529 100644
--- a/src/librbd/io/CopyupRequest.h
+++ b/src/librbd/io/CopyupRequest.h
@@ -95,7 +95,7 @@ private:
   bool m_flatten;
   ceph::bufferlist m_copyup_data;
   std::vector<AbstractObjectWriteRequest<ImageCtxT> *> m_pending_requests;
-  std::atomic<unsigned> m_pending_copyups { 0 };
+  unsigned m_pending_copyups = 0;
 
   AsyncOperation m_async_op;
 
-- 
2.39.5