RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-30 06:38:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13013 from wangzhengyong/master

Browse Source 
os/bluestore: remove no use parameter in bluestore_blob_t::map_bl

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-02-01 08:55:22 -06:00 committed by GitHub
commit ddb3f29b8e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/bluestore/BlueStore.cc
View File

@ -7880,7 +7880,7 @@ void BlueStore::_do_write_small(
if (!g_conf->bluestore_debug_omit_block_device_write) { if (!g_conf->bluestore_debug_omit_block_device_write) {
b->get_blob().map_bl( b->get_blob().map_bl(
b_off, padded, b_off, padded,
[&](uint64_t offset, uint64_t length, bufferlist& t) { [&](uint64_t offset, bufferlist& t) {
bdev->aio_write(offset, t, bdev->aio_write(offset, t,
&txc->ioc, wctx->buffered); &txc->ioc, wctx->buffered);
}); });
@ -8204,7 +8204,7 @@ int BlueStore::_do_alloc_write(
if (!g_conf->bluestore_debug_omit_block_device_write) { if (!g_conf->bluestore_debug_omit_block_device_write) {
b->get_blob().map_bl( b->get_blob().map_bl(
b_off, *l, b_off, *l,
[&](uint64_t offset, uint64_t length, bufferlist& t) { [&](uint64_t offset, bufferlist& t) {
bdev->aio_write(offset, t, &txc->ioc, false); bdev->aio_write(offset, t, &txc->ioc, false);
}); });
} }

4
src/os/bluestore/bluestore_types.h
View File

@ -528,7 +528,7 @@ struct bluestore_blob_t {
} }
void map_bl(uint64_t x_off, void map_bl(uint64_t x_off,
bufferlist& bl, bufferlist& bl,
std::function<void(uint64_t,uint64_t,bufferlist&)> f) const { std::function<void(uint64_t,bufferlist&)> f) const {
auto p = extents.begin(); auto p = extents.begin();
assert(p != extents.end()); assert(p != extents.end());
while (x_off >= p->length) { while (x_off >= p->length) {
@ -543,7 +543,7 @@ struct bluestore_blob_t {
uint64_t l = MIN(p->length - x_off, x_len); uint64_t l = MIN(p->length - x_off, x_len);
bufferlist t; bufferlist t;
it.copy(l, t); it.copy(l, t);
f(p->offset + x_off, l, t); f(p->offset + x_off, t);
x_off = 0; x_off = 0;
x_len -= l; x_len -= l;
++p; ++p;