From: Kefu Chai <kchai@redhat.com>
Date: Sat, 24 Apr 2021 05:53:50 +0000 (+0800)
Subject: Merge pull request #38641 from agayev/zoned-cleaner
X-Git-Tag: v17.1.0~2157
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9827ee5d5ea1be3229356e158fbe17a1f1ada292;p=ceph.git

Merge pull request #38641 from agayev/zoned-cleaner

os/bluestore: Some more plumbing for zone cleaning (WIP)

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
---

9827ee5d5ea1be3229356e158fbe17a1f1ada292
diff --cc src/os/bluestore/BlueStore.cc
index 34270974fb5d,78ce321c4f52..d03ad90f0172
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -5292,9 -5304,10 +5304,10 @@@ int BlueStore::_open_fm(KeyValueDB::Tra
      }
      // being able to allocate in units less than bdev block size 
      // seems to be a bad idea.
 -    ceph_assert( cct->_conf->bdev_block_size <= (int64_t)min_alloc_size);
 +    ceph_assert(cct->_conf->bdev_block_size <= min_alloc_size);
  
      uint64_t alloc_size = min_alloc_size;
+ #ifdef HAVE_LIBZBD
      if (bdev->is_smr()) {
        alloc_size = _zoned_piggyback_device_parameters_onto(alloc_size);
      }