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>

diff --cc src/os/bluestore/BitmapFreelistManager.cc
Simple merge

diff --cc src/os/bluestore/BitmapFreelistManager.h
index 81b131b4ef8689a3edb2d17c4befed63f88e908b,cb10c63d98a11ec0bbb9b50eedbc066c7286f4fb..10982545b73f035043194384576c702be40a744a
--- 1/src/os/bluestore/BitmapFreelistManager.h
--- 2/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/BlueStore.cc
Simple merge

diff --cc src/os/bluestore/FreelistManager.h
index 7eaba19f392bbe945f4415dd3e327e2a6bc2c405,8f7aacbf2e1f6a1a81ddbd950764d7f1157a3a41..b4418b2c7aae3355c8d83c38de9ec414aefa34a8
--- 1/src/os/bluestore/FreelistManager.h
--- 2/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;