summaryrefslogtreecommitdiffstats
path: root/src/os/bluestore/BlueStore.cc
diff options
context:
space:
mode:
authorJames Page <james.page@ubuntu.com>2018-08-07 15:06:05 +0200
committerJames Page <james.page@ubuntu.com>2018-08-08 13:07:48 +0200
commit01de299fc01b534a873c89f77068086e734514c9 (patch)
tree0334b08e1102e3a29ed0d4cdb301e22b706f3aed /src/os/bluestore/BlueStore.cc
parentMerge pull request #23430 from tchaikov/wip-silence-clang-warnings (diff)
downloadceph-01de299fc01b534a873c89f77068086e734514c9.tar.xz
ceph-01de299fc01b534a873c89f77068086e734514c9.zip
build: 32 bit architecture fixes
Misc fixes to resolve compilation failures on 32 bit architectures. These are mostly due to differences in types under 32 bit archs which are typically fixed by switching to a type which is consistent between architectures - size_t -> uint64_t for example. Signed-off-by: James Page <james.page@ubuntu.com>
Diffstat (limited to 'src/os/bluestore/BlueStore.cc')
-rw-r--r--src/os/bluestore/BlueStore.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 42318ab8111..d7ee82e51eb 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -12328,8 +12328,8 @@ size_t BlueStoreRepairer::StoreSpaceTracker::filter_out(
assert(!was_filtered_out);
assert(collections_bfs.size() == objects_bfs.size());
- size_t prev_pos = 0;
- size_t npos = collections_bfs.size();
+ uint64_t prev_pos = 0;
+ uint64_t npos = collections_bfs.size();
bloom_vector collections_reduced;
bloom_vector objects_reduced;
@@ -12338,8 +12338,8 @@ size_t BlueStoreRepairer::StoreSpaceTracker::filter_out(
if (e.second == 0) {
continue;
}
- size_t pos = max(e.first / granularity, prev_pos);
- size_t end_pos = 1 + (e.first + e.second - 1) / granularity;
+ uint64_t pos = max(e.first / granularity, prev_pos);
+ uint64_t end_pos = 1 + (e.first + e.second - 1) / granularity;
while (pos != npos && pos < end_pos) {
assert( collections_bfs[pos].element_count() ==
objects_bfs[pos].element_count());