From: Sage Weil <sage@newdream.net>
Date: Fri, 13 Oct 2017 19:34:56 +0000 (-0500)
Subject: Merge pull request #18050 from xiexingguo/wip-pr-17610
X-Git-Tag: v12.2.2~153
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3804d216d21d7e2b12e69eae1c1ef293229a6ca;p=ceph.git

Merge pull request #18050 from xiexingguo/wip-pr-17610

luminous: os/bluestore: set bitmap freelist resolution to min_alloc_size

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

d3804d216d21d7e2b12e69eae1c1ef293229a6ca
diff --cc src/os/bluestore/BitmapFreelistManager.h
index 81b131b4ef8,cb10c63d98a..10982545b73
--- a/src/os/bluestore/BitmapFreelistManager.h
+++ b/src/os/bluestore/BitmapFreelistManager.h
@@@ -51,9 -51,10 +51,10 @@@ public
  
    static void setup_merge_operator(KeyValueDB *db, string prefix);
  
-   int create(uint64_t size, KeyValueDB::Transaction txn) override;
+   int create(uint64_t size, uint64_t min_alloc_size,
+ 	     KeyValueDB::Transaction txn) override;
  
 -  int init() override;
 +  int init(uint64_t dev_size) override;
    void shutdown() override;
  
    void dump() override;
diff --cc src/os/bluestore/FreelistManager.h
index 7eaba19f392,8f7aacbf2e1..b4418b2c7aa
--- a/src/os/bluestore/FreelistManager.h
+++ b/src/os/bluestore/FreelistManager.h
@@@ -24,9 -24,10 +24,10 @@@ public
  
    static void setup_merge_operators(KeyValueDB *db);
  
-   virtual int create(uint64_t size, KeyValueDB::Transaction txn) = 0;
+   virtual int create(uint64_t size, uint64_t min_alloc_size,
+ 		     KeyValueDB::Transaction txn) = 0;
  
 -  virtual int init() = 0;
 +  virtual int init(uint64_t dev_size) = 0;
    virtual void shutdown() = 0;
  
    virtual void dump() = 0;