diff --git a/src/osd.cpp b/src/osd.cpp index 2202e6db..ada003cf 100644 --- a/src/osd.cpp +++ b/src/osd.cpp @@ -460,7 +460,7 @@ void osd_t::print_slow() int l = sizeof(alloc), n; char *buf = alloc; #define bufprintf(s, ...) { n = snprintf(buf, l, s, __VA_ARGS__); n = n < 0 ? 0 : n; buf += n; l -= n; } - bufprintf("[OSD %lu] Slow op %lx", osd_num, op); + bufprintf("[OSD %lu] Slow op %lx", osd_num, (unsigned long)op); if (kv.second->osd_num) { bufprintf(" from peer OSD %lu (client %d)", kv.second->osd_num, kv.second->peer_fd); diff --git a/src/osd_primary_chain.cpp b/src/osd_primary_chain.cpp index 64b061e8..01fc39ed 100644 --- a/src/osd_primary_chain.cpp +++ b/src/osd_primary_chain.cpp @@ -219,7 +219,7 @@ int osd_t::submit_bitmap_subops(osd_op_t *cur_op, pg_t & pg) op_data->n_subops++; } } - if (op_data->n_subops) + if (op_data->n_subops > 0) { op_data->fact_ver = 0; op_data->done = op_data->errors = 0; diff --git a/src/osd_primary_subops.cpp b/src/osd_primary_subops.cpp index 829f0b83..5b6ab48d 100644 --- a/src/osd_primary_subops.cpp +++ b/src/osd_primary_subops.cpp @@ -472,7 +472,7 @@ void osd_t::submit_primary_del_batch(osd_op_t *cur_op, obj_ver_osd_t *chunks_to_ osd_primary_op_data_t *op_data = cur_op->op_data; op_data->n_subops = chunks_to_delete_count; op_data->done = op_data->errors = op_data->errcode = 0; - if (!op_data->n_subops) + if (op_data->n_subops <= 0) { return; }