From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Aug 2016 15:13:46 +0000 (-0400)
Subject: os/bluestore/ExtentFreelistManager: move default create out of parent
X-Git-Tag: ses5-milestone5~94^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F10698%2Fhead;p=ceph.git

os/bluestore/ExtentFreelistManager: move default create out of parent

The only other instance of FreelistManager defines this
differently anyway.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/ExtentFreelistManager.cc b/src/os/bluestore/ExtentFreelistManager.cc
index 97de391b289f..3bc0ed9cc977 100644
--- a/src/os/bluestore/ExtentFreelistManager.cc
+++ b/src/os/bluestore/ExtentFreelistManager.cc
@@ -11,6 +11,12 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "freelist "
 
+int ExtentFreelistManager::create(uint64_t size, KeyValueDB::Transaction txn)
+{
+  release(0, size, txn);
+  return 0;
+}
+
 int ExtentFreelistManager::init()
 {
   dout(1) << __func__ << dendl;
diff --git a/src/os/bluestore/ExtentFreelistManager.h b/src/os/bluestore/ExtentFreelistManager.h
index 71a2ccc3d2a7..839a251817ec 100644
--- a/src/os/bluestore/ExtentFreelistManager.h
+++ b/src/os/bluestore/ExtentFreelistManager.h
@@ -35,6 +35,8 @@ public:
     total_free(0) {
   }
 
+  int create(uint64_t size, KeyValueDB::Transaction txn) override;
+
   int init() override;
   void shutdown() override;
 
diff --git a/src/os/bluestore/FreelistManager.h b/src/os/bluestore/FreelistManager.h
index e037c0901cfc..b3ca24b7bf46 100644
--- a/src/os/bluestore/FreelistManager.h
+++ b/src/os/bluestore/FreelistManager.h
@@ -22,10 +22,7 @@ public:
 
   static void setup_merge_operators(KeyValueDB *db);
 
-  virtual int create(uint64_t size, KeyValueDB::Transaction txn) {
-    release(0, size, txn);
-    return 0;
-  }
+  virtual int create(uint64_t size, KeyValueDB::Transaction txn) = 0;
 
   virtual int init() = 0;
   virtual void shutdown() = 0;