From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Fri, 10 Apr 2015 05:44:07 +0000 (+0800)
Subject: librbd/AsyncResize: avoid dup incrementing refresh seq
X-Git-Tag: v9.0.1~150^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4325%2Fhead;p=ceph.git

librbd/AsyncResize: avoid dup incrementing refresh seq

The refresh_seq is incremented in notify_change when calling
notify_async_complete after the locker owner completes the resize
request.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
---

diff --git a/src/librbd/AsyncResizeRequest.cc b/src/librbd/AsyncResizeRequest.cc
index 621d59d967d3..eda844cd47fc 100644
--- a/src/librbd/AsyncResizeRequest.cc
+++ b/src/librbd/AsyncResizeRequest.cc
@@ -98,7 +98,6 @@ bool AsyncResizeRequest::should_complete(int r) {
     ldout(cct, 5) << "UPDATE_HEADER" << dendl;
     if (send_shrink_object_map()) {
       update_size_and_overlap();
-      increment_refresh_seq();
       return true;
     }
     break;
@@ -106,7 +105,6 @@ bool AsyncResizeRequest::should_complete(int r) {
   case STATE_SHRINK_OBJECT_MAP:
     ldout(cct, 5) << "SHRINK_OBJECT_MAP" << dendl;
     update_size_and_overlap();
-    increment_refresh_seq();
     return true;
 
   case STATE_FINISHED:
@@ -301,12 +299,6 @@ void AsyncResizeRequest::compute_parent_overlap() {
   }
 }
 
-void AsyncResizeRequest::increment_refresh_seq() {
-  m_image_ctx.refresh_lock.Lock();
-  ++m_image_ctx.refresh_seq;
-  m_image_ctx.refresh_lock.Unlock();
-}
-
 void AsyncResizeRequest::update_size_and_overlap() {
   RWLock::WLocker snap_locker(m_image_ctx.snap_lock);
   m_image_ctx.size = m_new_size;
diff --git a/src/librbd/AsyncResizeRequest.h b/src/librbd/AsyncResizeRequest.h
index 277b39d2d768..61f1dd52586f 100644
--- a/src/librbd/AsyncResizeRequest.h
+++ b/src/librbd/AsyncResizeRequest.h
@@ -97,7 +97,6 @@ private:
   void send_update_header();
 
   void compute_parent_overlap();
-  void increment_refresh_seq();
   void update_size_and_overlap();
 
 };