From 41bdd8b6d43700c0b0de2a028769f8036391da1c Mon Sep 17 00:00:00 2001
From: Mykola Golub <to.my.trociny@gmail.com>
Date: Sat, 9 Dec 2017 11:40:13 +0200
Subject: [PATCH] librbd: remove unused member in FlattenRequest

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
---
 src/librbd/Operations.cc               |  9 ++++-----
 src/librbd/operation/FlattenRequest.cc | 11 ++++-------
 src/librbd/operation/FlattenRequest.h  | 13 +++++--------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/librbd/Operations.cc b/src/librbd/Operations.cc
index 393a8b2d7c8..4d71e3d319b 100644
--- a/src/librbd/Operations.cc
+++ b/src/librbd/Operations.cc
@@ -405,16 +405,15 @@ void Operations<I>::execute_flatten(ProgressContext &prog_ctx,
   assert(r == 0);
   assert(overlap <= m_image_ctx.size);
 
-  uint64_t object_size = m_image_ctx.get_object_size();
-  uint64_t  overlap_objects = Striper::get_num_objects(m_image_ctx.layout,
-                                                       overlap);
+  uint64_t overlap_objects = Striper::get_num_objects(m_image_ctx.layout,
+                                                      overlap);
 
   m_image_ctx.parent_lock.put_read();
   m_image_ctx.snap_lock.put_read();
 
   operation::FlattenRequest<I> *req = new operation::FlattenRequest<I>(
-    m_image_ctx, new C_NotifyUpdate<I>(m_image_ctx, on_finish), object_size,
-    overlap_objects, snapc, prog_ctx);
+    m_image_ctx, new C_NotifyUpdate<I>(m_image_ctx, on_finish), overlap_objects,
+    snapc, prog_ctx);
   req->send();
 }
 
diff --git a/src/librbd/operation/FlattenRequest.cc b/src/librbd/operation/FlattenRequest.cc
index c9d912fc15b..a1d88f0451f 100644
--- a/src/librbd/operation/FlattenRequest.cc
+++ b/src/librbd/operation/FlattenRequest.cc
@@ -22,10 +22,9 @@ template <typename I>
 class C_FlattenObject : public C_AsyncObjectThrottle<I> {
 public:
   C_FlattenObject(AsyncObjectThrottle<I> &throttle, I *image_ctx,
-                  uint64_t object_size, ::SnapContext snapc, uint64_t object_no)
-    : C_AsyncObjectThrottle<I>(throttle, *image_ctx), m_object_size(object_size),
-      m_snapc(snapc), m_object_no(object_no)
-  {
+                  ::SnapContext snapc, uint64_t object_no)
+    : C_AsyncObjectThrottle<I>(throttle, *image_ctx), m_snapc(snapc),
+      m_object_no(object_no) {
   }
 
   int send() override {
@@ -55,7 +54,6 @@ public:
   }
 
 private:
-  uint64_t m_object_size;
   ::SnapContext m_snapc;
   uint64_t m_object_no;
 };
@@ -105,8 +103,7 @@ void FlattenRequest<I>::send_op() {
   m_state = STATE_FLATTEN_OBJECTS;
   typename AsyncObjectThrottle<I>::ContextFactory context_factory(
     boost::lambda::bind(boost::lambda::new_ptr<C_FlattenObject<I> >(),
-      boost::lambda::_1, &image_ctx, m_object_size, m_snapc,
-      boost::lambda::_2));
+      boost::lambda::_1, &image_ctx, m_snapc, boost::lambda::_2));
   AsyncObjectThrottle<I> *throttle = new AsyncObjectThrottle<I>(
     this, image_ctx, context_factory, this->create_callback_context(), &m_prog_ctx,
     0, m_overlap_objects);
diff --git a/src/librbd/operation/FlattenRequest.h b/src/librbd/operation/FlattenRequest.h
index 1035a141e29..f64a043ab55 100644
--- a/src/librbd/operation/FlattenRequest.h
+++ b/src/librbd/operation/FlattenRequest.h
@@ -19,12 +19,10 @@ class FlattenRequest : public Request<ImageCtxT>
 {
 public:
   FlattenRequest(ImageCtxT &image_ctx, Context *on_finish,
-		 uint64_t object_size, uint64_t overlap_objects,
-		 const ::SnapContext &snapc, ProgressContext &prog_ctx)
-    : Request<ImageCtxT>(image_ctx, on_finish), m_object_size(object_size),
-      m_overlap_objects(overlap_objects), m_snapc(snapc), m_prog_ctx(prog_ctx),
-      m_ignore_enoent(false)
-  {
+                 uint64_t overlap_objects, const ::SnapContext &snapc,
+                 ProgressContext &prog_ctx)
+    : Request<ImageCtxT>(image_ctx, on_finish), m_overlap_objects(overlap_objects),
+      m_snapc(snapc), m_prog_ctx(prog_ctx) {
   }
 
 protected:
@@ -69,14 +67,13 @@ private:
     STATE_UPDATE_CHILDREN
   };
 
-  uint64_t m_object_size;
   uint64_t m_overlap_objects;
   ::SnapContext m_snapc;
   ProgressContext &m_prog_ctx;
   State m_state = STATE_FLATTEN_OBJECTS;
 
   ParentSpec m_parent_spec;
-  bool m_ignore_enoent;
+  bool m_ignore_enoent = false;
 
   bool send_update_header();
   bool send_update_children();
-- 
2.39.5