RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20029 from tchaikov/wip-osx-build

Browse Source 
osdc,os,osd: fix build on osx

Reviewed-by: Adam Emerson <aemerson@redhat.com>
This commit is contained in:
Sage Weil 2018-01-22 17:48:00 -06:00 committed by GitHub
commit b4c91da985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/os/CMakeLists.txt
View File

@ -86,6 +86,7 @@ if(HAVE_LIBAIO)
endif(HAVE_LIBAIO)
if(WITH_FUSE)
target_include_directories(os SYSTEM PRIVATE ${FUSE_INCLUDE_DIRS})
target_link_libraries(os ${FUSE_LIBRARIES})
endif()

2
src/os/kstore/KStore.cc
View File

@ -1235,7 +1235,7 @@ int KStore::_do_read(
_do_read_stripe(o, offset - stripe_off, &stripe);
dout(30) << __func__ << " stripe " << offset - stripe_off << " got "
<< stripe.length() << dendl;
unsigned swant = std::min(stripe_size - stripe_off, length);
unsigned swant = std::min<unsigned>(stripe_size - stripe_off, length);
if (stripe.length()) {
if (swant == stripe.length()) {
bl.claim_append(stripe);

2
src/osd/PG.cc
View File

@ -2845,7 +2845,7 @@ void PG::_update_blocked_by()
{
// set a max on the number of blocking peers we report. if we go
// over, report a random subset. keep the result sorted.
unsigned keep = std::min(blocked_by.size(), cct->_conf->osd_max_pg_blocked_by);
unsigned keep = std::min<unsigned>(blocked_by.size(), cct->_conf->osd_max_pg_blocked_by);
unsigned skip = blocked_by.size() - keep;
info.stats.blocked_by.clear();
info.stats.blocked_by.resize(keep);

4
src/osdc/Striper.cc
View File

@ -287,7 +287,7 @@ void Striper::StripedReadResult::add_partial_sparse_result(
p != buffer_extents.end();
++p) {
uint64_t tofs = p->first;
uint64_t tlen = p->second;
size_t tlen = p->second;
ldout(cct, 30) << " be " << tofs << "~" << tlen << dendl;
while (tlen > 0) {
ldout(cct, 20) << " t " << tofs << "~" << tlen
@ -314,7 +314,7 @@ void Striper::StripedReadResult::add_partial_sparse_result(
if (s->first > bl_off) {
// gap in sparse read result
pair<bufferlist, uint64_t>& r = partial[tofs];
size_t gap = std::min(s->first - bl_off, tlen);
size_t gap = std::min<size_t>(s->first - bl_off, tlen);
ldout(cct, 20) << " s gap " << gap << ", skipping" << dendl;
r.second = gap;
total_intended_len += r.second;