From: xie xingguo Date: Thu, 29 Dec 2016 11:50:26 +0000 (+0800) Subject: os/bluestore/BitmapFreelistManager: prefix "_" to get_offset() method X-Git-Tag: v12.0.0~153^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c9e220b2aa6c87e8713d2cd542254fd3ba8d28bc;p=ceph-ci.git os/bluestore/BitmapFreelistManager: prefix "_" to get_offset() method To keep pace with other private methods. Signed-off-by: xie xingguo --- diff --git a/src/os/bluestore/BitmapFreelistManager.cc b/src/os/bluestore/BitmapFreelistManager.cc index 27e55156204..7c9fc263ac9 100644 --- a/src/os/bluestore/BitmapFreelistManager.cc +++ b/src/os/bluestore/BitmapFreelistManager.cc @@ -243,7 +243,7 @@ bool BitmapFreelistManager::enumerate_next(uint64_t *offset, uint64_t *length) while (true) { enumerate_bl_pos = get_next_clear_bit(enumerate_bl, enumerate_bl_pos); if (enumerate_bl_pos >= 0) { - *offset = get_offset(enumerate_offset, enumerate_bl_pos); + *offset = _get_offset(enumerate_offset, enumerate_bl_pos); dout(30) << __func__ << " found clear bit, key 0x" << std::hex << enumerate_offset << " bit 0x" << enumerate_bl_pos << " offset 0x" << *offset @@ -257,7 +257,7 @@ bool BitmapFreelistManager::enumerate_next(uint64_t *offset, uint64_t *length) if (!enumerate_p->valid()) { enumerate_offset += bytes_per_key; enumerate_bl_pos = 0; - *offset = get_offset(enumerate_offset, enumerate_bl_pos); + *offset = _get_offset(enumerate_offset, enumerate_bl_pos); break; } string k = enumerate_p->key(); @@ -280,7 +280,7 @@ bool BitmapFreelistManager::enumerate_next(uint64_t *offset, uint64_t *length) while (true) { enumerate_bl_pos = get_next_set_bit(enumerate_bl, enumerate_bl_pos); if (enumerate_bl_pos >= 0) { - end = get_offset(enumerate_offset, enumerate_bl_pos); + end = _get_offset(enumerate_offset, enumerate_bl_pos); dout(30) << __func__ << " found set bit, key 0x" << std::hex << enumerate_offset << " bit 0x" << enumerate_bl_pos << " offset 0x" << end << std::dec diff --git a/src/os/bluestore/BitmapFreelistManager.h b/src/os/bluestore/BitmapFreelistManager.h index 7f8d062d912..5b5042be290 100644 --- a/src/os/bluestore/BitmapFreelistManager.h +++ b/src/os/bluestore/BitmapFreelistManager.h @@ -34,7 +34,7 @@ class BitmapFreelistManager : public FreelistManager { bufferlist enumerate_bl; ///< current key at enumerate_offset int enumerate_bl_pos; ///< bit position in enumerate_bl - uint64_t get_offset(uint64_t key_off, int bit) { + uint64_t _get_offset(uint64_t key_off, int bit) { return key_off + bit * bytes_per_block; }