From: Sage Weil <sage@redhat.com>
Date: Sat, 13 Aug 2016 20:33:14 +0000 (-0400)
Subject: Merge pull request #10431 from ifed01/wip-bluestore-fix-csum-disable2
X-Git-Tag: ses5-milestone5~125
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea63a4e1841f14d76e610993bd7c1ee6c21771aa;p=ceph.git

Merge pull request #10431 from ifed01/wip-bluestore-fix-csum-disable2

os/bluestore: proper handling for csum enable/disable settings

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

ea63a4e1841f14d76e610993bd7c1ee6c21771aa
diff --cc src/os/bluestore/bluestore_types.h
index 2c2446a2f5f,c445f06d552..de7dcd0767a
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@@ -337,13 -326,10 +337,13 @@@ struct bluestore_blob_t 
    bool has_unused() const {
      return has_flag(FLAG_HAS_UNUSED);
    }
 +  bool has_refmap() const {
 +    return has_flag(FLAG_HAS_REFMAP);
 +  }
  
    /// return chunk (i.e. min readable block) size for the blob
-   uint64_t get_chunk_size(uint64_t dev_block_size) {
-     return has_csum() ? MAX(dev_block_size, get_csum_chunk_size()) : dev_block_size;
+   uint64_t get_chunk_size(bool csum_enabled, uint64_t dev_block_size) {
+     return csum_enabled && has_csum() ? MAX(dev_block_size, get_csum_chunk_size()) : dev_block_size;
    }
    uint32_t get_csum_chunk_size() const {
      return 1 << csum_chunk_order;