Fix some compilation warnings
This commit is contained in:
@@ -58,7 +58,6 @@ class journal_flusher_co
|
|||||||
int i, res;
|
int i, res;
|
||||||
bool read_to_fill_incomplete;
|
bool read_to_fill_incomplete;
|
||||||
int copy_count;
|
int copy_count;
|
||||||
bool do_repeat = false;
|
|
||||||
|
|
||||||
friend class journal_flusher_t;
|
friend class journal_flusher_t;
|
||||||
|
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ using heap_mvcc_map_t = robin_hood::unordered_flat_map<object_id, heap_object_mv
|
|||||||
|
|
||||||
class blockstore_heap_t
|
class blockstore_heap_t
|
||||||
{
|
{
|
||||||
friend class heap_entry_t;
|
friend struct heap_entry_t;
|
||||||
|
|
||||||
blockstore_disk_t *dsk = NULL;
|
blockstore_disk_t *dsk = NULL;
|
||||||
uint8_t* buffer_area = NULL;
|
uint8_t* buffer_area = NULL;
|
||||||
|
|||||||
@@ -269,7 +269,7 @@ resume_6:
|
|||||||
}
|
}
|
||||||
GET_SQE();
|
GET_SQE();
|
||||||
data->iov = (iovec){ buf, len };
|
data->iov = (iovec){ buf, len };
|
||||||
data->callback = [this, offset, cb](ring_data_t *data)
|
data->callback = [offset, cb](ring_data_t *data)
|
||||||
{
|
{
|
||||||
if (data->res < 0)
|
if (data->res < 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -898,7 +898,7 @@ void cluster_client_t::execute_cas(cluster_op_t *op)
|
|||||||
.opcode = OSD_OP_SYNC,
|
.opcode = OSD_OP_SYNC,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
.callback = [this, op](osd_op_t *part)
|
.callback = [op](osd_op_t *part)
|
||||||
{
|
{
|
||||||
if (part->reply.hdr.retval != 0)
|
if (part->reply.hdr.retval != 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ int disk_tool_t::trim_data(std::string device)
|
|||||||
fprintf(stderr, "Reading metadata\n");
|
fprintf(stderr, "Reading metadata\n");
|
||||||
data_alloc = new allocator_t(dsk.block_count);
|
data_alloc = new allocator_t(dsk.block_count);
|
||||||
r = process_meta(
|
r = process_meta(
|
||||||
[this](blockstore_meta_header_v3_t *hdr) {},
|
[](blockstore_meta_header_v3_t *hdr) {},
|
||||||
[this](blockstore_heap_t *heap, heap_entry_t *obj, uint32_t meta_block_num)
|
[this](blockstore_heap_t *heap, heap_entry_t *obj, uint32_t meta_block_num)
|
||||||
{
|
{
|
||||||
for (auto wr = obj; wr; wr = heap->prev(wr))
|
for (auto wr = obj; wr; wr = heap->prev(wr))
|
||||||
|
|||||||
@@ -584,7 +584,7 @@ void osd_t::submit_list_subop(osd_num_t role_osd, pg_peering_state_t *ps)
|
|||||||
.opcode = OSD_OP_SEC_LIST,
|
.opcode = OSD_OP_SEC_LIST,
|
||||||
},
|
},
|
||||||
.list_pg = ps->pg_num,
|
.list_pg = ps->pg_num,
|
||||||
.pg_count = pool_cfg.applied_pg_count,
|
.pg_count = (uint32_t)pool_cfg.applied_pg_count,
|
||||||
.pg_stripe_size = pool_cfg.applied_pg_stripe_size,
|
.pg_stripe_size = pool_cfg.applied_pg_stripe_size,
|
||||||
.min_inode = ((uint64_t)(ps->pool_id) << (64 - POOL_ID_BITS)),
|
.min_inode = ((uint64_t)(ps->pool_id) << (64 - POOL_ID_BITS)),
|
||||||
.max_inode = ((uint64_t)(ps->pool_id+1) << (64 - POOL_ID_BITS)) - 1,
|
.max_inode = ((uint64_t)(ps->pool_id+1) << (64 - POOL_ID_BITS)) - 1,
|
||||||
|
|||||||
Reference in New Issue
Block a user