]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #9370 from majianpeng/bitmap-allocator
authorSage Weil <sage@redhat.com>
Tue, 7 Jun 2016 15:30:29 +0000 (11:30 -0400)
committerSage Weil <sage@redhat.com>
Tue, 7 Jun 2016 15:30:29 +0000 (11:30 -0400)
os/bluestore/BitMapAllocator: fix free space beyond size of BitAlloca…

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
1  2 
src/os/bluestore/BitAllocator.cc
src/os/bluestore/BitAllocator.h

Simple merge
index 3184890ba66efb86d82804fdc13a207c9acd9659,d3192b34ae7760adbd3e4743fb9b7d081bc28928..565472cf21bbe1c268cfd99e16e73d690e22f301
@@@ -103,9 -105,9 +103,9 @@@ public
      }
      m_cur_idx++;
  
-     if (m_cur_idx == m_list->size() &&
+     if (m_cur_idx == (int64_t)m_list->size() &&
          m_wrap) {
 -      m_cur_idx %= m_list->size();
 +      m_cur_idx = 0;
        m_wrapped = true;
      }