From 15cc83b8e61bd5e43626cd3334b2551ce11e7dac Mon Sep 17 00:00:00 2001 From: Zhiqiang Wang Date: Fri, 10 Apr 2015 13:44:07 +0800 Subject: [PATCH] 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 --- src/librbd/AsyncResizeRequest.cc | 8 -------- src/librbd/AsyncResizeRequest.h | 1 - 2 files changed, 9 deletions(-) diff --git a/src/librbd/AsyncResizeRequest.cc b/src/librbd/AsyncResizeRequest.cc index 621d59d967d..eda844cd47f 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 277b39d2d76..61f1dd52586 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(); }; -- 2.47.3