Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

os/bluestore: drop unused param "what" in apply() #17251

Merged
merged 1 commit into from
Aug 29, 2017
Merged

os/bluestore: drop unused param "what" in apply() #17251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/os/bluestore/BlueStore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<void(uint64_t,
BlueStore::mempool_dynamic_bitset &)> f) {
auto end = ROUND_UP_TO(off + len, granularity);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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;
Expand Down