From 834542c4027a8cc4d23eff089827d328919372d2 Mon Sep 17 00:00:00 2001 From: songweibin Date: Fri, 25 Aug 2017 15:19:02 +0800 Subject: [PATCH] os/bluestore: drop useless variable of "what" in apply func Signed-off-by: songweibin --- src/os/bluestore/BlueStore.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index e3663b4081d..8f461abc676 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5413,7 +5413,6 @@ static void apply(uint64_t off, uint64_t len, uint64_t granularity, BlueStore::mempool_dynamic_bitset &bitset, - const char *what, std::function f) { auto end = ROUND_UP_TO(off + len, granularity); @@ -5442,7 +5441,7 @@ int BlueStore::_fsck_check_extents( } bool already = false; apply( - e.offset, e.length, block_size, used_blocks, __func__, + e.offset, e.length, block_size, used_blocks, [&](uint64_t pos, mempool_dynamic_bitset &bs) { if (bs.test(pos)) already = true; @@ -5546,7 +5545,7 @@ int BlueStore::fsck(bool deep) used_blocks.resize(bdev->get_size() / block_size); apply( - 0, SUPER_RESERVED, block_size, used_blocks, "0~SUPER_RESERVED", + 0, SUPER_RESERVED, block_size, used_blocks, [&](uint64_t pos, mempool_dynamic_bitset &bs) { bs.set(pos); } @@ -5555,7 +5554,7 @@ int BlueStore::fsck(bool deep) if (bluefs) { for (auto e = bluefs_extents.begin(); e != bluefs_extents.end(); ++e) { apply( - e.get_start(), e.get_len(), block_size, used_blocks, "bluefs", + e.get_start(), e.get_len(), block_size, used_blocks, [&](uint64_t pos, mempool_dynamic_bitset &bs) { bs.set(pos); } @@ -5954,7 +5953,7 @@ int BlueStore::fsck(bool deep) << " released 0x" << std::hex << wt.released << std::dec << dendl; for (auto e = wt.released.begin(); e != wt.released.end(); ++e) { apply( - e.get_start(), e.get_len(), block_size, used_blocks, "deferred", + e.get_start(), e.get_len(), block_size, used_blocks, [&](uint64_t pos, mempool_dynamic_bitset &bs) { bs.set(pos); } @@ -5969,7 +5968,7 @@ int BlueStore::fsck(bool deep) // know they are allocated. for (auto e = bluefs_extents.begin(); e != bluefs_extents.end(); ++e) { apply( - e.get_start(), e.get_len(), block_size, used_blocks, "bluefs_extents", + e.get_start(), e.get_len(), block_size, used_blocks, [&](uint64_t pos, mempool_dynamic_bitset &bs) { bs.reset(pos); } @@ -5980,7 +5979,7 @@ int BlueStore::fsck(bool deep) while (fm->enumerate_next(&offset, &length)) { bool intersects = false; apply( - offset, length, block_size, used_blocks, "free", + offset, length, block_size, used_blocks, [&](uint64_t pos, mempool_dynamic_bitset &bs) { if (bs.test(pos)) { intersects = true; -- 2.47.3