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.

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

os/bluestore: a few cleanups #11483

Merged
merged 2 commits into from Oct 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/os/bluestore/BlueStore.h
Expand Up @@ -636,7 +636,7 @@ class BlueStore : public ObjectStore,
}
int s = seek_shard(offset);
assert(s >= 0);
if (s == shards.size() - 1) {
if (s == (int)shards.size() - 1) {
return false; // last shard
}
if (offset + length <= shards[s+1].offset) {
Expand Down
12 changes: 7 additions & 5 deletions src/os/bluestore/bluestore_types.cc
Expand Up @@ -557,11 +557,13 @@ ostream& operator<<(ostream& out, const bluestore_blob_t& o)
if (o.sbid) {
out << " sbid 0x" << std::hex << o.sbid << std::dec;
}
out << " clen 0x" << std::hex
<< o.compressed_length_orig
<< " -> 0x"
<< o.compressed_length
<< std::dec;
if (o.is_compressed()) {
out << " clen 0x" << std::hex
<< o.compressed_length_orig
<< " -> 0x"
<< o.compressed_length
<< std::dec;
}
if (o.flags) {
out << " " << o.get_flags_string();
}
Expand Down