Move block_manager member down into checker base class.

thin-provisioning/device_checker.cc

@@ -5,7 +5,7 @@ using namespace thin_provisioning;
 //----------------------------------------------------------------
 
 device_checker::device_checker(block_manager::ptr bm)
-	: bm_(bm)
+	: checker(bm)
 {
 }
 

thin-provisioning/device_checker.h

@@ -10,10 +10,6 @@ namespace thin_provisioning {
 	public:
 		device_checker(block_manager::ptr bm);
 		damage_list_ptr check();
-
-	private:
-		block_manager::ptr bm_;
-		damage_list_ptr damage_;
 	};
 }
 

thin-provisioning/metadata_checker.cc

@@ -165,6 +165,13 @@ metadata_damage_visitor::visit(metadata_damage const &damage)
 	damage.visit(*this);
 }
 
+//--------------------------------
+
+checker::checker(block_manager::ptr bm)
+	: bm_(bm)
+{
+}
+
 //----------------------------------------------------------------
 
 #if 0

thin-provisioning/metadata_checker.h

@@ -156,8 +156,13 @@ namespace thin_provisioning {
 		typedef persistent_data::block_manager<> block_manager;
 		typedef boost::shared_ptr<checker> ptr;
 
+		checker(block_manager::ptr bm);
+
 		virtual ~checker() {};
 		virtual damage_list_ptr check() = 0;
+
+	protected:
+		block_manager::ptr bm_;
 	};
 }
 

thin-provisioning/superblock_checker.cc

@@ -9,8 +9,7 @@ using namespace thin_provisioning;
 //----------------------------------------------------------------
 
 superblock_checker::superblock_checker(block_manager::ptr bm)
-	: bm_(bm),
-	  damage(new damage_list)
+	: checker(bm)
 {
 }
 

thin-provisioning/superblock_checker.h

@@ -10,11 +10,6 @@ namespace thin_provisioning {
 	public:
 		superblock_checker(block_manager::ptr bm);
 		damage_list_ptr check();
-
-	private:
-		// FIXME: surely we can push these down to the base class?
-		block_manager::ptr bm_;
-		damage_list_ptr damage;
 	};
 }