librbd: always use current parent overlap

With deep-copyup, there is no longer a reason to shrink the
parent overlap for IO operations.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librbd/AsyncResizeRequest.h b/src/librbd/AsyncResizeRequest.h
index 61f1dd52586f5833beff7f41cc74da90595cfd81..c13677c51ceb37011ccbd78b9dbb81645e114462 100644 (file)
--- a/src/librbd/AsyncResizeRequest.h
+++ b/src/librbd/AsyncResizeRequest.h
@@ -29,10 +29,6 @@ public:
     return m_new_size;
   }
 
-  inline uint64_t get_parent_overlap() const {
-    return m_new_parent_overlap;
-  }
-
 private:
   /**
    * Resize goes through the following state machine to resize the image

diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index c5e253ebd0a328e85cb508dba3f22cc10cd8a795..28c3ea752c0a1aebe86436ee7e90f27a969283a5 100644 (file)
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -572,12 +572,6 @@ public:
   int ImageCtx::get_parent_overlap(snap_t in_snap_id, uint64_t *overlap) const
   {
     assert(snap_lock.is_locked());
-    if (in_snap_id == CEPH_NOSNAP && !async_resize_reqs.empty() &&
-        async_resize_reqs.front()->shrinking()) {
-      *overlap = async_resize_reqs.front()->get_parent_overlap();
-      return 0;
-    }
-
     const parent_info *info = get_parent_info(in_snap_id);
     if (info) {
       *overlap = info->overlap;