From: Kefu Chai Date: Tue, 15 May 2018 15:50:34 +0000 (+0800) Subject: rbd: use const_iterator for decode X-Git-Tag: v14.0.0~97^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d03ff14d81c4547fca2516d30d170f0a74f3042c;p=ceph.git rbd: use const_iterator for decode Signed-off-by: Kefu Chai --- diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc index e163f11432c3..b8fcadc3ce2b 100644 --- a/src/cls/rbd/cls_rbd.cc +++ b/src/cls/rbd/cls_rbd.cc @@ -130,7 +130,7 @@ static int read_key(cls_method_context_t hctx, const string &key, T *out) } try { - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); decode(*out, it); } catch (const buffer::error &err) { CLS_ERR("error decoding %s", key.c_str()); @@ -255,7 +255,7 @@ int snapshot_iterate(cls_method_context_t hctx, L& lambda) { cls_rbd_snap snap_meta; for (auto& val : vals) { - bufferlist::iterator iter = val.second.begin(); + auto iter = val.second.cbegin(); try { decode(snap_meta, iter); } catch (const buffer::error &err) { @@ -306,7 +306,7 @@ int create(cls_method_context_t hctx, bufferlist *in, bufferlist *out) int64_t data_pool_id = -1; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(size, iter); decode(order, iter); decode(features, iter); @@ -395,7 +395,7 @@ int get_features(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { bool read_only = false; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { uint64_t snap_id; decode(snap_id, iter); @@ -438,7 +438,7 @@ int set_features(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t features; uint64_t mask; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(features, iter); decode(mask, iter); @@ -531,7 +531,7 @@ int get_size(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t snap_id, size; uint8_t order; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); } catch (const buffer::error &err) { @@ -580,7 +580,7 @@ int set_size(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t size; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(size, iter); } catch (const buffer::error &err) { @@ -661,7 +661,7 @@ int get_protection_status(cls_method_context_t hctx, bufferlist *in, { snapid_t snap_id; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); } catch (const buffer::error &err) { @@ -715,7 +715,7 @@ int set_protection_status(cls_method_context_t hctx, bufferlist *in, snapid_t snap_id; uint8_t status; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); decode(status, iter); @@ -832,7 +832,7 @@ int set_stripe_unit_count(cls_method_context_t hctx, bufferlist *in, bufferlist { uint64_t stripe_unit, stripe_count; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(stripe_unit, iter); decode(stripe_count, iter); @@ -898,7 +898,7 @@ int get_create_timestamp(cls_method_context_t hctx, bufferlist *in, bufferlist * } } else { try { - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); decode(timestamp, it); } catch (const buffer::error &err) { CLS_ERR("could not decode create_timestamp"); @@ -924,7 +924,7 @@ int get_create_timestamp(cls_method_context_t hctx, bufferlist *in, bufferlist * int get_flags(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t snap_id; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); } catch (const buffer::error &err) { @@ -973,7 +973,7 @@ int set_flags(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t flags; uint64_t mask; uint64_t snap_id = CEPH_NOSNAP; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(flags, iter); decode(mask, iter); @@ -1072,7 +1072,7 @@ int op_features_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t op_features; uint64_t mask; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(op_features, iter); decode(mask, iter); @@ -1107,7 +1107,7 @@ int get_parent(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t snap_id; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); } catch (const buffer::error &err) { @@ -1163,7 +1163,7 @@ int set_parent(cls_method_context_t hctx, bufferlist *in, bufferlist *out) snapid_t snapid; uint64_t size; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(pool, iter); decode(id, iter); @@ -1302,7 +1302,7 @@ int remove_parent(cls_method_context_t hctx, bufferlist *in, bufferlist *out) * methods for dealing with rbd_children object */ -static int decode_parent_common(bufferlist::iterator& it, uint64_t *pool_id, +static int decode_parent_common(bufferlist::const_iterator& it, uint64_t *pool_id, string *image_id, snapid_t *snap_id) { try { @@ -1319,7 +1319,7 @@ static int decode_parent_common(bufferlist::iterator& it, uint64_t *pool_id, static int decode_parent(bufferlist *in, uint64_t *pool_id, string *image_id, snapid_t *snap_id) { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); return decode_parent_common(it, pool_id, image_id, snap_id); } @@ -1327,7 +1327,7 @@ static int decode_parent_and_child(bufferlist *in, uint64_t *pool_id, string *image_id, snapid_t *snap_id, string *c_image_id) { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); int r = decode_parent_common(it, pool_id, image_id, snap_id); if (r < 0) return r; @@ -1621,7 +1621,7 @@ int get_snapshot_name(cls_method_context_t hctx, bufferlist *in, bufferlist *out { uint64_t snap_id; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); } catch (const buffer::error &err) { @@ -1659,7 +1659,7 @@ int get_snapshot_timestamp(cls_method_context_t hctx, bufferlist *in, bufferlist { uint64_t snap_id; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); } catch (const buffer::error &err) { @@ -1696,7 +1696,7 @@ int snapshot_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t snap_id; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(snap_id, iter); } catch (const buffer::error &err) { @@ -1743,7 +1743,7 @@ int snapshot_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t snap_limit; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(snap_meta.name, iter); decode(snap_meta.id, iter); if (!iter.end()) { @@ -1880,7 +1880,7 @@ int snapshot_rename(cls_method_context_t hctx, bufferlist *in, bufferlist *out) int r; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(src_snap_id, iter); decode(dst_snap_name, iter); } catch (const buffer::error &err) { @@ -1947,7 +1947,7 @@ int snapshot_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) snapid_t snap_id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(snap_id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -2044,7 +2044,7 @@ int snapshot_trash_add(cls_method_context_t hctx, bufferlist *in, snapid_t snap_id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(snap_id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -2157,7 +2157,7 @@ int get_id(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string id; try { - bufferlist::iterator iter = read_bl.begin(); + auto iter = read_bl.cbegin(); decode(id, iter); } catch (const buffer::error &err) { return -EIO; @@ -2185,7 +2185,7 @@ int set_id(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -2325,7 +2325,7 @@ int dir_rename_image(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string src, dest, id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(src, iter); decode(dest, iter); decode(id, iter); @@ -2356,7 +2356,7 @@ int dir_get_id(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string name; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(name, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -2390,7 +2390,7 @@ int dir_get_name(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -2427,7 +2427,7 @@ int dir_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -2452,7 +2452,7 @@ int dir_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) for (map::iterator it = vals.begin(); it != vals.end(); ++it) { string id; - bufferlist::iterator iter = it->second.begin(); + auto iter = it->second.cbegin(); try { decode(id, iter); } catch (const buffer::error &err) { @@ -2497,7 +2497,7 @@ int dir_add_image(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string name, id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(name, iter); decode(id, iter); } catch (const buffer::error &err) { @@ -2522,7 +2522,7 @@ int dir_remove_image(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string name, id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(name, iter); decode(id, iter); } catch (const buffer::error &err) { @@ -2550,7 +2550,7 @@ int object_map_read(cls_method_context_t hctx, BitVector<2> &object_map) } try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(object_map, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode object map: %s", err.what()); @@ -2595,7 +2595,7 @@ int object_map_save(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { BitVector<2> object_map; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(object_map, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -2625,7 +2625,7 @@ int object_map_resize(cls_method_context_t hctx, bufferlist *in, bufferlist *out uint64_t object_count; uint8_t default_state; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(object_count, iter); decode(default_state, iter); } catch (const buffer::error &err) { @@ -2691,7 +2691,7 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out uint8_t new_object_state; boost::optional current_object_state; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_object_no, iter); decode(end_object_no, iter); decode(new_object_state, iter); @@ -2717,7 +2717,7 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out } try { - bufferlist::iterator it = header_bl.begin(); + auto it = header_bl.cbegin(); object_map.decode_header(it); } catch (const buffer::error &err) { CLS_ERR("failed to decode object map header: %s", err.what()); @@ -2734,7 +2734,7 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out } try { - bufferlist::iterator it = footer_bl.begin(); + auto it = footer_bl.cbegin(); object_map.decode_footer(it); } catch (const buffer::error &err) { CLS_ERR("failed to decode object map footer: %s", err.what()); @@ -2759,7 +2759,7 @@ int object_map_update(cls_method_context_t hctx, bufferlist *in, bufferlist *out } try { - bufferlist::iterator it = data_bl.begin(); + auto it = data_bl.cbegin(); object_map.decode_data(it, byte_offset); } catch (const buffer::error &err) { CLS_ERR("failed to decode data chunk [%" PRIu64 "]: %s", @@ -2862,7 +2862,7 @@ int object_map_snap_remove(cls_method_context_t hctx, bufferlist *in, { BitVector<2> src_object_map; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(src_object_map, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -2924,7 +2924,7 @@ int metadata_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -2974,7 +2974,7 @@ int metadata_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { map data, raw_data; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(data, iter); } catch (const buffer::error &err) { @@ -3007,7 +3007,7 @@ int metadata_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string key; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(key, iter); } catch (const buffer::error &err) { @@ -3038,7 +3038,7 @@ int metadata_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string key; bufferlist value; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(key, iter); } catch (const buffer::error &err) { @@ -3084,7 +3084,7 @@ int snapshot_set_limit(cls_method_context_t hctx, bufferlist *in, size_t snap_count = 0; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(new_limit, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -3157,7 +3157,7 @@ int child_attach(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t snap_id; cls::rbd::ChildImageSpec child_image; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(snap_id, it); decode(child_image, it); } catch (const buffer::error &err) { @@ -3231,7 +3231,7 @@ int child_detach(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t snap_id; cls::rbd::ChildImageSpec child_image; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(snap_id, it); decode(child_image, it); } catch (const buffer::error &err) { @@ -3323,7 +3323,7 @@ int children_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t snap_id; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(snap_id, it); } catch (const buffer::error &err) { return -EINVAL; @@ -3408,7 +3408,7 @@ int old_snapshot_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) const char *snap_name; const char *snap_names = ((char *)header) + names_ofs; const char *end = snap_names + header->snap_names_len; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); string s; uint64_t snap_id; @@ -3495,7 +3495,7 @@ int old_snapshot_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *o const char *snap_names = ((char *)header) + names_ofs; const char *orig_names = snap_names; const char *end = snap_names + header->snap_names_len; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); string s; unsigned i; bool found = false; @@ -3590,7 +3590,7 @@ int old_snapshot_rename(cls_method_context_t hctx, bufferlist *in, bufferlist *o const char *snap_names = ((char *)header) + names_ofs; const char *orig_names = snap_names; const char *end = snap_names + header->snap_names_len; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); unsigned i; bool found = false; @@ -3737,7 +3737,7 @@ int read_peers(cls_method_context_t hctx, for (auto &it : vals) { try { - bufferlist::iterator bl_it = it.second.begin(); + auto bl_it = it.second.cbegin(); cls::rbd::MirrorPeer peer; decode(peer, bl_it); peers->push_back(peer); @@ -3765,7 +3765,7 @@ int read_peer(cls_method_context_t hctx, const std::string &id, } try { - bufferlist::iterator bl_it = bl.begin(); + auto bl_it = bl.cbegin(); decode(*peer, bl_it); } catch (const buffer::error &err) { CLS_ERR("could not decode peer '%s'", id.c_str()); @@ -3801,7 +3801,7 @@ int image_get(cls_method_context_t hctx, const string &image_id, } try { - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); decode(*mirror_image, it); } catch (const buffer::error &err) { CLS_ERR("could not decode mirrored image '%s'", image_id.c_str()); @@ -3926,13 +3926,13 @@ struct MirrorImageStatusOnDisk : cls::rbd::MirrorImageStatus { cls::rbd::MirrorImageStatus::encode(bl); } - void decode_meta(bufferlist::iterator &it) { + void decode_meta(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(origin, it); DECODE_FINISH(it); } - void decode(bufferlist::iterator &it) { + void decode(bufferlist::const_iterator &it) { decode_meta(it); cls::rbd::MirrorImageStatus::decode(it); } @@ -3988,7 +3988,7 @@ int image_status_get(cls_method_context_t hctx, const string &global_image_id, MirrorImageStatusOnDisk ondisk_status; try { - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); decode(ondisk_status, it); } catch (const buffer::error &err) { CLS_ERR("could not decode status for mirrored image, global id '%s'", @@ -4031,7 +4031,7 @@ int image_status_list(cls_method_context_t hctx, mirror_images->size() < max_return; ++it) { const std::string &image_id = it->first.substr(IMAGE_KEY_PREFIX.size()); cls::rbd::MirrorImage mirror_image; - bufferlist::iterator iter = it->second.begin(); + auto iter = it->second.cbegin(); try { decode(mirror_image, iter); } catch (const buffer::error &err) { @@ -4089,7 +4089,7 @@ int image_status_get_summary(cls_method_context_t hctx, } cls::rbd::MirrorImage mirror_image; - bufferlist::iterator iter = list_it.second.begin(); + auto iter = list_it.second.cbegin(); try { decode(mirror_image, iter); } catch (const buffer::error &err) { @@ -4143,7 +4143,7 @@ int image_status_remove_down(cls_method_context_t hctx) { MirrorImageStatusOnDisk status; try { - bufferlist::iterator it = list_it.second.begin(); + auto it = list_it.second.cbegin(); status.decode_meta(it); } catch (const buffer::error &err) { CLS_ERR("could not decode status metadata for mirrored image '%s'", @@ -4249,7 +4249,7 @@ int mirror_image_map_list(cls_method_context_t hctx, it->first.substr(MIRROR_IMAGE_MAP_KEY_PREFIX.size()); cls::rbd::MirrorImageMap mirror_image_map; - bufferlist::iterator iter = it->second.begin(); + auto iter = it->second.cbegin(); try { decode(mirror_image_map, iter); } catch (const buffer::error &err) { @@ -4301,7 +4301,7 @@ int mirror_uuid_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { std::string mirror_uuid; try { - bufferlist::iterator bl_it = in->begin(); + auto bl_it = in->cbegin(); decode(mirror_uuid, bl_it); } catch (const buffer::error &err) { return -EINVAL; @@ -4362,7 +4362,7 @@ int mirror_mode_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint32_t mirror_mode_decode; try { - bufferlist::iterator bl_it = in->begin(); + auto bl_it = in->cbegin(); decode(mirror_mode_decode, bl_it); } catch (const buffer::error &err) { return -EINVAL; @@ -4456,7 +4456,7 @@ int mirror_peer_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { cls::rbd::MirrorPeer mirror_peer; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(mirror_peer, it); } catch (const buffer::error &err) { return -EINVAL; @@ -4528,7 +4528,7 @@ int mirror_peer_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { std::string uuid; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(uuid, it); } catch (const buffer::error &err) { return -EINVAL; @@ -4555,7 +4555,7 @@ int mirror_peer_set_client(cls_method_context_t hctx, bufferlist *in, std::string uuid; std::string client_name; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(uuid, it); decode(client_name, it); } catch (const buffer::error &err) { @@ -4589,7 +4589,7 @@ int mirror_peer_set_cluster(cls_method_context_t hctx, bufferlist *in, std::string uuid; std::string cluster_name; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(uuid, it); decode(cluster_name, it); } catch (const buffer::error &err) { @@ -4625,7 +4625,7 @@ int mirror_image_list(cls_method_context_t hctx, bufferlist *in, std::string start_after; uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -4652,7 +4652,7 @@ int mirror_image_list(cls_method_context_t hctx, bufferlist *in, const std::string &image_id = it->first.substr(mirror::IMAGE_KEY_PREFIX.size()); cls::rbd::MirrorImage mirror_image; - bufferlist::iterator iter = it->second.begin(); + auto iter = it->second.cbegin(); try { decode(mirror_image, iter); } catch (const buffer::error &err) { @@ -4687,7 +4687,7 @@ int mirror_image_get_image_id(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { std::string global_id; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(global_id, it); } catch (const buffer::error &err) { return -EINVAL; @@ -4717,7 +4717,7 @@ int mirror_image_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string image_id; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(image_id, it); } catch (const buffer::error &err) { return -EINVAL; @@ -4747,7 +4747,7 @@ int mirror_image_set(cls_method_context_t hctx, bufferlist *in, string image_id; cls::rbd::MirrorImage mirror_image; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(image_id, it); decode(mirror_image, it); } catch (const buffer::error &err) { @@ -4772,7 +4772,7 @@ int mirror_image_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string image_id; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(image_id, it); } catch (const buffer::error &err) { return -EINVAL; @@ -4798,7 +4798,7 @@ int mirror_image_status_set(cls_method_context_t hctx, bufferlist *in, string global_image_id; cls::rbd::MirrorImageStatus status; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(global_image_id, it); decode(status, it); } catch (const buffer::error &err) { @@ -4823,7 +4823,7 @@ int mirror_image_status_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string global_image_id; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(global_image_id, it); } catch (const buffer::error &err) { return -EINVAL; @@ -4848,7 +4848,7 @@ int mirror_image_status_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string global_image_id; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(global_image_id, it); } catch (const buffer::error &err) { return -EINVAL; @@ -4886,7 +4886,7 @@ int mirror_image_status_list(cls_method_context_t hctx, bufferlist *in, std::string start_after; uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -4975,7 +4975,7 @@ int mirror_instances_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { std::string instance_id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(instance_id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -4999,7 +4999,7 @@ int mirror_instances_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { std::string instance_id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(instance_id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5026,7 +5026,7 @@ int mirror_image_map_list(cls_method_context_t hctx, bufferlist *in, std::string start_after; uint64_t max_return; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(start_after, it); decode(max_return, it); } catch (const buffer::error &err) { @@ -5057,7 +5057,7 @@ int mirror_image_map_update(cls_method_context_t hctx, bufferlist *in, cls::rbd::MirrorImageMap image_map; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(global_image_id, it); decode(image_map, it); } catch (const buffer::error &err) { @@ -5090,7 +5090,7 @@ int mirror_image_map_remove(cls_method_context_t hctx, bufferlist *in, std::string global_image_id; try { - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); decode(global_image_id, it); } catch (const buffer::error &err) { return -EINVAL; @@ -5218,7 +5218,7 @@ int snap_list(cls_method_context_t hctx, cls::rbd::GroupSnapshot start_after, for (map::iterator it = vals.begin(); it != vals.end() && group_snaps->size() < max_return; ++it) { - bufferlist::iterator iter = it->second.begin(); + auto iter = it->second.cbegin(); cls::rbd::GroupSnapshot snap; try { decode(snap, iter); @@ -5285,7 +5285,7 @@ int group_dir_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -5309,7 +5309,7 @@ int group_dir_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) for (pair val: vals) { string id; - bufferlist::iterator iter = val.second.begin(); + auto iter = val.second.cbegin(); try { decode(id, iter); } catch (const buffer::error &err) { @@ -5353,7 +5353,7 @@ int group_dir_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string name, id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(name, iter); decode(id, iter); } catch (const buffer::error &err) { @@ -5378,7 +5378,7 @@ int group_dir_rename(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string src, dest, id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(src, iter); decode(dest, iter); decode(id, iter); @@ -5407,7 +5407,7 @@ int group_dir_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string name, id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(name, iter); decode(id, iter); } catch (const buffer::error &err) { @@ -5432,7 +5432,7 @@ int group_image_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) cls::rbd::GroupImageStatus st; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(st, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5465,7 +5465,7 @@ int group_image_remove(cls_method_context_t hctx, CLS_LOG(20, "group_image_remove"); cls::rbd::GroupImageSpec spec; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(spec, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5501,7 +5501,7 @@ int group_image_list(cls_method_context_t hctx, cls::rbd::GroupImageSpec start_after; uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -5523,7 +5523,7 @@ int group_image_list(cls_method_context_t hctx, for (map::iterator it = vals.begin(); it != vals.end() && res.size() < max_return; ++it) { - bufferlist::iterator iter = it->second.begin(); + auto iter = it->second.cbegin(); cls::rbd::GroupImageLinkState state; try { decode(state, iter); @@ -5567,7 +5567,7 @@ int image_group_add(cls_method_context_t hctx, CLS_LOG(20, "image_group_add"); cls::rbd::GroupSpec new_group; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(new_group, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5581,7 +5581,7 @@ int image_group_add(cls_method_context_t hctx, // success. If this image already belongs to another group then abort. cls::rbd::GroupSpec old_group; try { - bufferlist::iterator iter = existing_refbl.begin(); + auto iter = existing_refbl.cbegin(); decode(old_group, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5631,7 +5631,7 @@ int image_group_remove(cls_method_context_t hctx, CLS_LOG(20, "image_group_remove"); cls::rbd::GroupSpec spec; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(spec, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5644,7 +5644,7 @@ int image_group_remove(cls_method_context_t hctx, } cls::rbd::GroupSpec ref_spec; - bufferlist::iterator iter = refbl.begin(); + auto iter = refbl.cbegin(); try { decode(ref_spec, iter); } catch (const buffer::error &err) { @@ -5691,7 +5691,7 @@ int image_group_get(cls_method_context_t hctx, cls::rbd::GroupSpec spec; if (r != -ENOENT) { - bufferlist::iterator iter = refbl.begin(); + auto iter = refbl.cbegin(); try { decode(spec, iter); } catch (const buffer::error &err) { @@ -5718,7 +5718,7 @@ int group_snap_set(cls_method_context_t hctx, CLS_LOG(20, "group_snap_set"); cls::rbd::GroupSnapshot group_snap; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(group_snap, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5771,7 +5771,7 @@ int group_snap_remove(cls_method_context_t hctx, CLS_LOG(20, "group_snap_remove"); std::string snap_id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(snap_id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5801,7 +5801,7 @@ int group_snap_get_by_id(cls_method_context_t hctx, std::string snap_id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(snap_id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5815,7 +5815,7 @@ int group_snap_get_by_id(cls_method_context_t hctx, } cls::rbd::GroupSnapshot group_snap; - bufferlist::iterator iter = snapbl.begin(); + auto iter = snapbl.cbegin(); try { decode(group_snap, iter); } catch (const buffer::error &err) { @@ -5848,7 +5848,7 @@ int group_snap_list(cls_method_context_t hctx, cls::rbd::GroupSnapshot start_after; uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -5899,7 +5899,7 @@ int trash_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) string id; cls::rbd::TrashImageSpec trash_spec; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); decode(trash_spec, iter); } catch (const buffer::error &err) { @@ -5945,7 +5945,7 @@ int trash_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -5992,7 +5992,7 @@ int trash_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -6051,7 +6051,7 @@ int trash_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); } catch (const buffer::error &err) { return -EINVAL; diff --git a/src/cls/rbd/cls_rbd.h b/src/cls/rbd/cls_rbd.h index 72a8152d6bbf..37f9a5efcf84 100644 --- a/src/cls/rbd/cls_rbd.h +++ b/src/cls/rbd/cls_rbd.h @@ -32,7 +32,7 @@ struct cls_rbd_parent { encode(overlap, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(pool, bl); decode(id, bl); @@ -90,7 +90,7 @@ struct cls_rbd_snap { encode(child_count, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { DECODE_START(7, p); decode(id, p); decode(name, p); diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc index 2a702471626e..8f2f6d7327a7 100644 --- a/src/cls/rbd/cls_rbd_client.cc +++ b/src/cls/rbd/cls_rbd_client.cc @@ -25,7 +25,7 @@ namespace librbd { op->exec("rbd", "get_features", features_bl); } - int get_initial_metadata_finish(bufferlist::iterator *it, + int get_initial_metadata_finish(bufferlist::const_iterator *it, std::string *object_prefix, uint8_t *order, uint64_t *features) { @@ -59,7 +59,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_initial_metadata_finish(&it, object_prefix, order, features); } @@ -83,7 +83,7 @@ namespace librbd { rados::cls::lock::get_lock_info_start(op, RBD_LOCK_NAME); } - int get_mutable_metadata_finish(bufferlist::iterator *it, + int get_mutable_metadata_finish(bufferlist::const_iterator *it, uint64_t *size, uint64_t *features, uint64_t *incompatible_features, std::mapexec("rbd", "get_data_pool", bl); } - int get_data_pool_finish(bufferlist::iterator *it, int64_t *data_pool_id) { + int get_data_pool_finish(bufferlist::const_iterator *it, int64_t *data_pool_id) { try { decode(*data_pool_id, *it); } catch (const buffer::error &err) { @@ -259,7 +259,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_data_pool_finish(&it, data_pool_id); } @@ -274,7 +274,7 @@ namespace librbd { return r; try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(*order, iter); decode(*size, iter); } catch (const buffer::error &err) { @@ -306,7 +306,7 @@ namespace librbd { op->exec("rbd", "get_parent", bl); } - int get_parent_finish(bufferlist::iterator *it, ParentSpec *pspec, + int get_parent_finish(bufferlist::const_iterator *it, ParentSpec *pspec, uint64_t *parent_overlap) { try { @@ -333,7 +333,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_parent_finish(&it, pspec, parent_overlap); } @@ -370,7 +370,7 @@ namespace librbd { } - int get_flags_finish(bufferlist::iterator *it, uint64_t *flags, + int get_flags_finish(bufferlist::const_iterator *it, uint64_t *flags, const std::vector &snap_ids, std::vector *snap_flags) { snap_flags->resize(snap_ids.size()); @@ -398,7 +398,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_flags_finish(&it, flags, snap_ids, snap_flags); } @@ -418,7 +418,7 @@ namespace librbd { op->exec("rbd", "op_features_get", in_bl); } - int op_features_get_finish(bufferlist::iterator *it, uint64_t *op_features) + int op_features_get_finish(bufferlist::const_iterator *it, uint64_t *op_features) { try { decode(*op_features, *it); @@ -440,7 +440,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return op_features_get_finish(&it, op_features); } @@ -523,7 +523,7 @@ namespace librbd { op->exec("rbd", "get_children", in_bl); } - int get_children_finish(bufferlist::iterator *it, + int get_children_finish(bufferlist::const_iterator *it, std::set* children) { try { decode(*children, *it); @@ -545,7 +545,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_children_finish(&it, &children); } @@ -562,7 +562,7 @@ namespace librbd { } } - int snapshot_get_finish(bufferlist::iterator *it, + int snapshot_get_finish(bufferlist::const_iterator *it, const std::vector &ids, std::vector* snaps, std::vector *parents, @@ -609,7 +609,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return snapshot_get_finish(&it, ids, snaps, parents, protection_statuses); } @@ -655,7 +655,7 @@ namespace librbd { op->exec("rbd", "get_snapcontext", bl); } - int get_snapcontext_finish(bufferlist::iterator *it, + int get_snapcontext_finish(bufferlist::const_iterator *it, ::SnapContext *snapc) { try { @@ -681,7 +681,7 @@ namespace librbd { return r; } - auto bl_it = out_bl.begin(); + auto bl_it = out_bl.cbegin(); return get_snapcontext_finish(&bl_it, snapc); } @@ -698,7 +698,7 @@ namespace librbd { } } - int snapshot_list_finish(bufferlist::iterator *it, + int snapshot_list_finish(bufferlist::const_iterator *it, const std::vector &ids, std::vector *names, std::vector *sizes, @@ -753,7 +753,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return snapshot_list_finish(&it, ids, names, sizes, parents, protection_statuses); } @@ -768,7 +768,7 @@ namespace librbd { } } - int snapshot_timestamp_list_finish(bufferlist::iterator *it, + int snapshot_timestamp_list_finish(bufferlist::const_iterator *it, const std::vector &ids, std::vector *timestamps) { @@ -798,7 +798,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return snapshot_timestamp_list_finish(&it, ids, timestamps); } @@ -833,7 +833,7 @@ namespace librbd { op->exec("rbd", "snap_list", in_bl); } - int old_snapshot_list_finish(bufferlist::iterator *it, + int old_snapshot_list_finish(bufferlist::const_iterator *it, std::vector *names, std::vector *sizes, ::SnapContext *snapc) { @@ -870,7 +870,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return old_snapshot_list_finish(&it, names, sizes, snapc); } @@ -879,7 +879,7 @@ namespace librbd { op->exec("rbd", "get_all_features", in); } - int get_all_features_finish(bufferlist::iterator *it, + int get_all_features_finish(bufferlist::const_iterator *it, uint64_t *all_features) { try { decode(*all_features, *it); @@ -900,7 +900,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_all_features_finish(&it, all_features); } @@ -918,7 +918,7 @@ namespace librbd { op->exec("rbd", "get_protection_status", bl); } - int get_protection_status_finish(bufferlist::iterator *it, + int get_protection_status_finish(bufferlist::const_iterator *it, uint8_t *protection_status) { try { @@ -941,7 +941,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_protection_status_finish(&it, protection_status); } @@ -974,7 +974,7 @@ namespace librbd { } try { - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); decode(*limit, iter); } catch (const buffer::error &err) { return -EBADMSG; @@ -995,7 +995,7 @@ namespace librbd { op->exec("rbd", "get_stripe_unit_count", empty_bl); } - int get_stripe_unit_count_finish(bufferlist::iterator *it, + int get_stripe_unit_count_finish(bufferlist::const_iterator *it, uint64_t *stripe_unit, uint64_t *stripe_count) { assert(stripe_unit); @@ -1022,7 +1022,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_stripe_unit_count_finish(&it, stripe_unit, stripe_count); } @@ -1050,7 +1050,7 @@ namespace librbd { op->exec("rbd", "get_create_timestamp", empty_bl); } - int get_create_timestamp_finish(bufferlist::iterator *it, + int get_create_timestamp_finish(bufferlist::const_iterator *it, utime_t *timestamp) { assert(timestamp); @@ -1074,7 +1074,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_create_timestamp_finish(&it, timestamp); } @@ -1085,7 +1085,7 @@ namespace librbd { op->exec("rbd", "get_id", empty_bl); } - int get_id_finish(bufferlist::iterator *it, std::string *id) { + int get_id_finish(bufferlist::const_iterator *it, std::string *id) { try { decode(*id, *it); } catch (const buffer::error &err) { @@ -1105,7 +1105,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return get_id_finish(&it, id); } @@ -1134,7 +1134,7 @@ namespace librbd { op->exec("rbd", "dir_get_id", bl); } - int dir_get_id_finish(bufferlist::iterator *iter, std::string *image_id) { + int dir_get_id_finish(bufferlist::const_iterator *iter, std::string *image_id) { try { decode(*image_id, *iter); } catch (const buffer::error &err) { @@ -1155,7 +1155,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); return dir_get_id_finish(&iter, id); } @@ -1166,7 +1166,7 @@ namespace librbd { op->exec("rbd", "dir_get_name", in_bl); } - int dir_get_name_finish(bufferlist::iterator *it, std::string *name) { + int dir_get_name_finish(bufferlist::const_iterator *it, std::string *name) { try { decode(*name, *it); } catch (const buffer::error &err) { @@ -1186,7 +1186,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return dir_get_name_finish(&it, name); } @@ -1200,7 +1200,7 @@ namespace librbd { op->exec("rbd", "dir_list", in_bl); } - int dir_list_finish(bufferlist::iterator *it, map *images) + int dir_list_finish(bufferlist::const_iterator *it, map *images) { try { decode(*images, *it); @@ -1223,7 +1223,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); return dir_list_finish(&iter, images); } @@ -1280,7 +1280,7 @@ namespace librbd { op->exec("rbd", "object_map_load", in_bl); } - int object_map_load_finish(bufferlist::iterator *it, + int object_map_load_finish(bufferlist::const_iterator *it, ceph::BitVector<2> *object_map) { try { decode(*object_map, *it); @@ -1302,7 +1302,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return object_map_load_finish(&it, object_map); } @@ -1405,7 +1405,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return metadata_list_finish(&it, pairs); } @@ -1418,7 +1418,7 @@ namespace librbd { op->exec("rbd", "metadata_list", in_bl); } - int metadata_list_finish(bufferlist::iterator *it, + int metadata_list_finish(bufferlist::const_iterator *it, std::map *pairs) { assert(pairs); @@ -1440,7 +1440,7 @@ namespace librbd { if (r < 0) return r; - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); try { decode(*s, iter); } catch (const buffer::error &err) { @@ -1504,7 +1504,7 @@ namespace librbd { op->exec("rbd", "children_list", bl); } - int children_list_finish(bufferlist::iterator *it, + int children_list_finish(bufferlist::const_iterator *it, cls::rbd::ChildImageSpecs *child_images) { child_images->clear(); @@ -1529,7 +1529,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); r = children_list_finish(&it, child_images); if (r < 0) { return r; @@ -1542,7 +1542,7 @@ namespace librbd { op->exec("rbd", "mirror_uuid_get", bl); } - int mirror_uuid_get_finish(bufferlist::iterator *it, + int mirror_uuid_get_finish(bufferlist::const_iterator *it, std::string *uuid) { try { decode(*uuid, *it); @@ -1562,7 +1562,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); r = mirror_uuid_get_finish(&it, uuid); if (r < 0) { return r; @@ -1588,7 +1588,7 @@ namespace librbd { op->exec("rbd", "mirror_mode_get", bl); } - int mirror_mode_get_finish(bufferlist::iterator *it, + int mirror_mode_get_finish(bufferlist::const_iterator *it, cls::rbd::MirrorMode *mirror_mode) { try { uint32_t mirror_mode_decode; @@ -1615,7 +1615,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); r = mirror_mode_get_finish(&it, mirror_mode); if (r < 0) { return r; @@ -1649,7 +1649,7 @@ namespace librbd { peers->clear(); try { - bufferlist::iterator bl_it = out_bl.begin(); + auto bl_it = out_bl.cbegin(); decode(*peers, bl_it); } catch (const buffer::error &err) { return -EBADMSG; @@ -1728,7 +1728,7 @@ namespace librbd { op->exec("rbd", "mirror_image_list", in_bl); } - int mirror_image_list_finish(bufferlist::iterator *it, + int mirror_image_list_finish(bufferlist::const_iterator *it, std::map *mirror_image_ids) { try { @@ -1751,7 +1751,7 @@ namespace librbd { return r; } - bufferlist::iterator bl_it = out_bl.begin(); + auto bl_it = out_bl.cbegin(); return mirror_image_list_finish(&bl_it, mirror_image_ids); } @@ -1762,7 +1762,7 @@ namespace librbd { op->exec( "rbd", "mirror_image_get_image_id", in_bl); } - int mirror_image_get_image_id_finish(bufferlist::iterator *it, + int mirror_image_get_image_id_finish(bufferlist::const_iterator *it, std::string *image_id) { try { decode(*image_id, *it); @@ -1784,7 +1784,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return mirror_image_get_image_id_finish(&it, image_id); } @@ -1799,7 +1799,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = mirror_image_get_finish(&iter, mirror_image); if (r < 0) { return r; @@ -1815,7 +1815,7 @@ namespace librbd { op->exec("rbd", "mirror_image_get", in_bl); } - int mirror_image_get_finish(bufferlist::iterator *iter, + int mirror_image_get_finish(bufferlist::const_iterator *iter, cls::rbd::MirrorImage *mirror_image) { try { decode(*mirror_image, *iter); @@ -1909,7 +1909,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = mirror_image_status_get_finish(&iter, status); if (r < 0) { return r; @@ -1924,7 +1924,7 @@ namespace librbd { op->exec("rbd", "mirror_image_status_get", bl); } - int mirror_image_status_get_finish(bufferlist::iterator *iter, + int mirror_image_status_get_finish(bufferlist::const_iterator *iter, cls::rbd::MirrorImageStatus *status) { try { decode(*status, *iter); @@ -1947,7 +1947,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = mirror_image_status_list_finish(&iter, images, statuses); if (r < 0) { return r; @@ -1964,7 +1964,7 @@ namespace librbd { op->exec("rbd", "mirror_image_status_list", bl); } - int mirror_image_status_list_finish(bufferlist::iterator *iter, + int mirror_image_status_list_finish(bufferlist::const_iterator *iter, std::map *images, std::map *statuses) { images->clear(); @@ -1989,7 +1989,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = mirror_image_status_get_summary_finish(&iter, states); if (r < 0) { return r; @@ -2003,7 +2003,7 @@ namespace librbd { op->exec("rbd", "mirror_image_status_get_summary", bl); } - int mirror_image_status_get_summary_finish(bufferlist::iterator *iter, + int mirror_image_status_get_summary_finish(bufferlist::const_iterator *iter, std::map *states) { try { decode(*states, *iter); @@ -2029,7 +2029,7 @@ namespace librbd { op->exec("rbd", "mirror_instances_list", bl); } - int mirror_instances_list_finish(bufferlist::iterator *iter, + int mirror_instances_list_finish(bufferlist::const_iterator *iter, std::vector *instance_ids) { instance_ids->clear(); try { @@ -2051,7 +2051,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = mirror_instances_list_finish(&iter, instance_ids); if (r < 0) { return r; @@ -2097,7 +2097,7 @@ namespace librbd { op->exec("rbd", "mirror_image_map_list", bl); } - int mirror_image_map_list_finish(bufferlist::iterator *iter, + int mirror_image_map_list_finish(bufferlist::const_iterator *iter, std::map *image_mapping) { try { decode(*image_mapping, *iter); @@ -2137,7 +2137,7 @@ namespace librbd { if (r < 0) return r; - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); try { decode(*cgs, iter); } catch (const buffer::error &err) { @@ -2199,7 +2199,7 @@ namespace librbd { if (r < 0) return r; - bufferlist::iterator iter = bl2.begin(); + auto iter = bl2.cbegin(); try { decode(*images, iter); } catch (const buffer::error &err) { @@ -2242,7 +2242,7 @@ namespace librbd { op->exec("rbd", "image_group_get", in_bl); } - int image_group_get_finish(bufferlist::iterator *iter, + int image_group_get_finish(bufferlist::const_iterator *iter, cls::rbd::GroupSpec *group_spec) { try { @@ -2265,7 +2265,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); return image_group_get_finish(&iter, group_spec); } @@ -2302,7 +2302,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); try { decode(*snapshot, iter); } catch (const buffer::error &err) { @@ -2326,7 +2326,7 @@ namespace librbd { if (r < 0) { return r; } - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); try { decode(*snapshots, iter); } catch (const buffer::error &err) { @@ -2381,7 +2381,7 @@ namespace librbd { op->exec("rbd", "trash_list", bl); } - int trash_list_finish(bufferlist::iterator *it, + int trash_list_finish(bufferlist::const_iterator *it, map *entries) { assert(entries); @@ -2408,7 +2408,7 @@ namespace librbd { return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); return trash_list_finish(&iter, entries); } @@ -2420,7 +2420,7 @@ namespace librbd { op->exec("rbd", "trash_get", bl); } - int trash_get_finish(bufferlist::iterator *it, + int trash_get_finish(bufferlist::const_iterator *it, cls::rbd::TrashImageSpec *trash_spec) { assert(trash_spec); try { @@ -2445,7 +2445,7 @@ namespace librbd { return r; } - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); return trash_get_finish(&it, trash_spec); } diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h index c842189bd471..8e6673a25e23 100644 --- a/src/cls/rbd/cls_rbd_client.h +++ b/src/cls/rbd/cls_rbd_client.h @@ -22,7 +22,7 @@ namespace librbd { namespace cls_client { // high-level interface to the header void get_initial_metadata_start(librados::ObjectReadOperation *op); - int get_initial_metadata_finish(bufferlist::iterator *it, + int get_initial_metadata_finish(bufferlist::const_iterator *it, std::string *object_prefix, uint8_t *order, uint64_t *features); @@ -31,7 +31,7 @@ namespace librbd { void get_mutable_metadata_start(librados::ObjectReadOperation *op, bool read_only); - int get_mutable_metadata_finish(bufferlist::iterator *it, + int get_mutable_metadata_finish(bufferlist::const_iterator *it, uint64_t *size, uint64_t *features, uint64_t *incompatible_features, std::map &snap_ids); - int get_flags_finish(bufferlist::iterator *it, uint64_t *flags, + int get_flags_finish(bufferlist::const_iterator *it, uint64_t *flags, const std::vector &snap_ids, std::vector *snap_flags); int get_flags(librados::IoCtx *ioctx, const std::string &oid, @@ -95,7 +95,7 @@ namespace librbd { void set_flags(librados::ObjectWriteOperation *op, snapid_t snap_id, uint64_t flags, uint64_t mask); void op_features_get_start(librados::ObjectReadOperation *op); - int op_features_get_finish(bufferlist::iterator *it, uint64_t *op_features); + int op_features_get_finish(bufferlist::const_iterator *it, uint64_t *op_features); int op_features_get(librados::IoCtx *ioctx, const std::string &oid, uint64_t *op_features); void op_features_set(librados::ObjectWriteOperation *op, @@ -114,14 +114,14 @@ namespace librbd { const ParentSpec &pspec, const std::string &c_imageid); void get_children_start(librados::ObjectReadOperation *op, const ParentSpec &pspec); - int get_children_finish(bufferlist::iterator *it, + int get_children_finish(bufferlist::const_iterator *it, std::set *children); int get_children(librados::IoCtx *ioctx, const std::string &oid, const ParentSpec &pspec, set& children); void snapshot_get_start(librados::ObjectReadOperation *op, const std::vector &ids); - int snapshot_get_finish(bufferlist::iterator *it, + int snapshot_get_finish(bufferlist::const_iterator *it, const std::vector &ids, std::vector* snaps, std::vector *parents, @@ -143,7 +143,7 @@ namespace librbd { snapid_t snap_id); void get_snapcontext_start(librados::ObjectReadOperation *op); - int get_snapcontext_finish(bufferlist::iterator *it, + int get_snapcontext_finish(bufferlist::const_iterator *it, ::SnapContext *snapc); int get_snapcontext(librados::IoCtx *ioctx, const std::string &oid, ::SnapContext *snapc); @@ -151,7 +151,7 @@ namespace librbd { /// NOTE: remove after Luminous is retired void snapshot_list_start(librados::ObjectReadOperation *op, const std::vector &ids); - int snapshot_list_finish(bufferlist::iterator *it, + int snapshot_list_finish(bufferlist::const_iterator *it, const std::vector &ids, std::vector *names, std::vector *sizes, @@ -167,7 +167,7 @@ namespace librbd { /// NOTE: remove after Luminous is retired void snapshot_timestamp_list_start(librados::ObjectReadOperation *op, const std::vector &ids); - int snapshot_timestamp_list_finish(bufferlist::iterator *it, + int snapshot_timestamp_list_finish(bufferlist::const_iterator *it, const std::vector &ids, std::vector *timestamps); int snapshot_timestamp_list(librados::IoCtx *ioctx, const std::string &oid, @@ -175,7 +175,7 @@ namespace librbd { std::vector *timestamps); void get_all_features_start(librados::ObjectReadOperation *op); - int get_all_features_finish(bufferlist::iterator *it, + int get_all_features_finish(bufferlist::const_iterator *it, uint64_t *all_features); int get_all_features(librados::IoCtx *ioctx, const std::string &oid, uint64_t *all_features); @@ -186,7 +186,7 @@ namespace librbd { /// NOTE: remove protection after clone v1 is retired void get_protection_status_start(librados::ObjectReadOperation *op, snapid_t snap_id); - int get_protection_status_finish(bufferlist::iterator *it, + int get_protection_status_finish(bufferlist::const_iterator *it, uint8_t *protection_status); int get_protection_status(librados::IoCtx *ioctx, const std::string &oid, snapid_t snap_id, uint8_t *protection_status); @@ -201,7 +201,7 @@ namespace librbd { uint64_t limit); void get_stripe_unit_count_start(librados::ObjectReadOperation *op); - int get_stripe_unit_count_finish(bufferlist::iterator *it, + int get_stripe_unit_count_finish(bufferlist::const_iterator *it, uint64_t *stripe_unit, uint64_t *stripe_count); int get_stripe_unit_count(librados::IoCtx *ioctx, const std::string &oid, @@ -212,7 +212,7 @@ namespace librbd { int set_stripe_unit_count(librados::IoCtx *ioctx, const std::string &oid, uint64_t stripe_unit, uint64_t stripe_count); void get_create_timestamp_start(librados::ObjectReadOperation *op); - int get_create_timestamp_finish(bufferlist::iterator *it, + int get_create_timestamp_finish(bufferlist::const_iterator *it, utime_t *timestamp); int get_create_timestamp(librados::IoCtx *ioctx, const std::string &oid, utime_t *timestamp); @@ -221,7 +221,7 @@ namespace librbd { map *pairs); void metadata_list_start(librados::ObjectReadOperation *op, const std::string &start, uint64_t max_return); - int metadata_list_finish(bufferlist::iterator *it, + int metadata_list_finish(bufferlist::const_iterator *it, std::map *pairs); void metadata_set(librados::ObjectWriteOperation *op, const map &data); @@ -246,7 +246,7 @@ namespace librbd { const cls::rbd::ChildImageSpec& child_image); void children_list_start(librados::ObjectReadOperation *op, snapid_t snap_id); - int children_list_finish(bufferlist::iterator *it, + int children_list_finish(bufferlist::const_iterator *it, cls::rbd::ChildImageSpecs *child_images); int children_list(librados::IoCtx *ioctx, const std::string &oid, snapid_t snap_id, @@ -254,7 +254,7 @@ namespace librbd { // operations on rbd_id objects void get_id_start(librados::ObjectReadOperation *op); - int get_id_finish(bufferlist::iterator *it, std::string *id); + int get_id_finish(bufferlist::const_iterator *it, std::string *id); int get_id(librados::IoCtx *ioctx, const std::string &oid, std::string *id); void set_id(librados::ObjectWriteOperation *op, const std::string &id); @@ -265,15 +265,15 @@ namespace librbd { const std::string &name, std::string *id); void dir_get_id_start(librados::ObjectReadOperation *op, const std::string &image_name); - int dir_get_id_finish(bufferlist::iterator *iter, std::string *image_id); + int dir_get_id_finish(bufferlist::const_iterator *iter, std::string *image_id); void dir_get_name_start(librados::ObjectReadOperation *op, const std::string &id); - int dir_get_name_finish(bufferlist::iterator *it, std::string *name); + int dir_get_name_finish(bufferlist::const_iterator *it, std::string *name); int dir_get_name(librados::IoCtx *ioctx, const std::string &oid, const std::string &id, std::string *name); void dir_list_start(librados::ObjectReadOperation *op, const std::string &start, uint64_t max_return); - int dir_list_finish(bufferlist::iterator *it, map *images); + int dir_list_finish(bufferlist::const_iterator *it, map *images); int dir_list(librados::IoCtx *ioctx, const std::string &oid, const std::string &start, uint64_t max_return, map *images); @@ -292,7 +292,7 @@ namespace librbd { // operations on the rbd_object_map.$image_id object void object_map_load_start(librados::ObjectReadOperation *op); - int object_map_load_finish(bufferlist::iterator *it, + int object_map_load_finish(bufferlist::const_iterator *it, ceph::BitVector<2> *object_map); int object_map_load(librados::IoCtx *ioctx, const std::string &oid, ceph::BitVector<2> *object_map); @@ -318,7 +318,7 @@ namespace librbd { snapid_t src_snap_id, const std::string &dst_name); void old_snapshot_list_start(librados::ObjectReadOperation *op); - int old_snapshot_list_finish(bufferlist::iterator *it, + int old_snapshot_list_finish(bufferlist::const_iterator *it, std::vector *names, std::vector *sizes, ::SnapContext *snapc); @@ -329,12 +329,12 @@ namespace librbd { // operations on the rbd_mirroring object void mirror_uuid_get_start(librados::ObjectReadOperation *op); - int mirror_uuid_get_finish(bufferlist::iterator *it, + int mirror_uuid_get_finish(bufferlist::const_iterator *it, std::string *uuid); int mirror_uuid_get(librados::IoCtx *ioctx, std::string *uuid); int mirror_uuid_set(librados::IoCtx *ioctx, const std::string &uuid); void mirror_mode_get_start(librados::ObjectReadOperation *op); - int mirror_mode_get_finish(bufferlist::iterator *it, + int mirror_mode_get_finish(bufferlist::const_iterator *it, cls::rbd::MirrorMode *mirror_mode); int mirror_mode_get(librados::IoCtx *ioctx, cls::rbd::MirrorMode *mirror_mode); @@ -356,14 +356,14 @@ namespace librbd { const std::string &cluster_name); void mirror_image_list_start(librados::ObjectReadOperation *op, const std::string &start, uint64_t max_return); - int mirror_image_list_finish(bufferlist::iterator *it, + int mirror_image_list_finish(bufferlist::const_iterator *it, std::map *mirror_image_ids); int mirror_image_list(librados::IoCtx *ioctx, const std::string &start, uint64_t max_return, std::map *mirror_image_ids); void mirror_image_get_image_id_start(librados::ObjectReadOperation *op, const std::string &global_image_id); - int mirror_image_get_image_id_finish(bufferlist::iterator *it, + int mirror_image_get_image_id_finish(bufferlist::const_iterator *it, std::string *image_id); int mirror_image_get_image_id(librados::IoCtx *ioctx, const std::string &global_image_id, @@ -372,7 +372,7 @@ namespace librbd { cls::rbd::MirrorImage *mirror_image); void mirror_image_get_start(librados::ObjectReadOperation *op, const std::string &image_id); - int mirror_image_get_finish(bufferlist::iterator *iter, + int mirror_image_get_finish(bufferlist::const_iterator *iter, cls::rbd::MirrorImage *mirror_image); void mirror_image_set(librados::ObjectWriteOperation *op, const std::string &image_id, @@ -398,7 +398,7 @@ namespace librbd { cls::rbd::MirrorImageStatus *status); void mirror_image_status_get_start(librados::ObjectReadOperation *op, const std::string &global_image_id); - int mirror_image_status_get_finish(bufferlist::iterator *iter, + int mirror_image_status_get_finish(bufferlist::const_iterator *iter, cls::rbd::MirrorImageStatus *status); int mirror_image_status_list(librados::IoCtx *ioctx, const std::string &start, uint64_t max_return, @@ -407,19 +407,19 @@ namespace librbd { void mirror_image_status_list_start(librados::ObjectReadOperation *op, const std::string &start, uint64_t max_return); - int mirror_image_status_list_finish(bufferlist::iterator *iter, + int mirror_image_status_list_finish(bufferlist::const_iterator *iter, std::map *images, std::map *statuses); int mirror_image_status_get_summary(librados::IoCtx *ioctx, std::map *states); void mirror_image_status_get_summary_start(librados::ObjectReadOperation *op); - int mirror_image_status_get_summary_finish(bufferlist::iterator *iter, + int mirror_image_status_get_summary_finish(bufferlist::const_iterator *iter, std::map *states); int mirror_image_status_remove_down(librados::IoCtx *ioctx); void mirror_image_status_remove_down(librados::ObjectWriteOperation *op); void mirror_instances_list_start(librados::ObjectReadOperation *op); - int mirror_instances_list_finish(bufferlist::iterator *iter, + int mirror_instances_list_finish(bufferlist::const_iterator *iter, std::vector *instance_ids); int mirror_instances_list(librados::IoCtx *ioctx, std::vector *instance_ids); @@ -436,7 +436,7 @@ namespace librbd { void mirror_image_map_list_start(librados::ObjectReadOperation *op, const std::string &start_after, uint64_t max_read); - int mirror_image_map_list_finish(bufferlist::iterator *iter, + int mirror_image_map_list_finish(bufferlist::const_iterator *iter, std::map *image_mapping); void mirror_image_map_update(librados::ObjectWriteOperation *op, const std::string &global_image_id, @@ -468,7 +468,7 @@ namespace librbd { int image_group_remove(librados::IoCtx *ioctx, const std::string &oid, const cls::rbd::GroupSpec &group_spec); void image_group_get_start(librados::ObjectReadOperation *op); - int image_group_get_finish(bufferlist::iterator *iter, + int image_group_get_finish(bufferlist::const_iterator *iter, cls::rbd::GroupSpec *group_spec); int image_group_get(librados::IoCtx *ioctx, const std::string &oid, cls::rbd::GroupSpec *group_spec); @@ -495,14 +495,14 @@ namespace librbd { int trash_remove(librados::IoCtx *ioctx, const std::string &id); void trash_list_start(librados::ObjectReadOperation *op, const std::string &start, uint64_t max_return); - int trash_list_finish(bufferlist::iterator *it, + int trash_list_finish(bufferlist::const_iterator *it, map *entries); int trash_list(librados::IoCtx *ioctx, const std::string &start, uint64_t max_return, map *entries); void trash_get_start(librados::ObjectReadOperation *op, const std::string &id); - int trash_get_finish(bufferlist::iterator *it, + int trash_get_finish(bufferlist::const_iterator *it, cls::rbd::TrashImageSpec *trash_spec); int trash_get(librados::IoCtx *ioctx, const std::string &id, cls::rbd::TrashImageSpec *trash_spec); diff --git a/src/cls/rbd/cls_rbd_types.cc b/src/cls/rbd/cls_rbd_types.cc index 301879c3a021..2897fe5b0bf5 100644 --- a/src/cls/rbd/cls_rbd_types.cc +++ b/src/cls/rbd/cls_rbd_types.cc @@ -17,7 +17,7 @@ void MirrorPeer::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void MirrorPeer::decode(bufferlist::iterator &it) { +void MirrorPeer::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(uuid, it); decode(cluster_name, it); @@ -82,7 +82,7 @@ void MirrorImage::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void MirrorImage::decode(bufferlist::iterator &it) { +void MirrorImage::decode(bufferlist::const_iterator &it) { uint8_t int_state; DECODE_START(1, it); decode(global_image_id, it); @@ -142,7 +142,7 @@ void MirrorImageStatus::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void MirrorImageStatus::decode(bufferlist::iterator &it) { +void MirrorImageStatus::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(state, it); decode(description, it); @@ -219,7 +219,7 @@ void ChildImageSpec::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void ChildImageSpec::decode(bufferlist::iterator &it) { +void ChildImageSpec::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(pool_id, it); decode(image_id, it); @@ -243,7 +243,7 @@ void GroupImageSpec::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void GroupImageSpec::decode(bufferlist::iterator &it) { +void GroupImageSpec::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(image_id, it); decode(pool_id, it); @@ -300,7 +300,7 @@ void GroupImageStatus::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void GroupImageStatus::decode(bufferlist::iterator &it) { +void GroupImageStatus::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(spec, it); decode(state, it); @@ -338,7 +338,7 @@ void GroupSpec::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void GroupSpec::decode(bufferlist::iterator &it) { +void GroupSpec::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(pool_id, it); decode(group_id, it); @@ -366,7 +366,7 @@ void GroupSnapshotNamespace::encode(bufferlist& bl) const { encode(group_snapshot_id, bl); } -void GroupSnapshotNamespace::decode(bufferlist::iterator& it) { +void GroupSnapshotNamespace::decode(bufferlist::const_iterator& it) { using ceph::decode; decode(group_pool, it); decode(group_id, it); @@ -385,7 +385,7 @@ void TrashSnapshotNamespace::encode(bufferlist& bl) const { encode(static_cast(original_snapshot_namespace_type), bl); } -void TrashSnapshotNamespace::decode(bufferlist::iterator& it) { +void TrashSnapshotNamespace::decode(bufferlist::const_iterator& it) { using ceph::decode; decode(original_name, it); uint32_t snap_type; @@ -418,7 +418,7 @@ private: class DecodeSnapshotNamespaceVisitor : public boost::static_visitor { public: - DecodeSnapshotNamespaceVisitor(bufferlist::iterator &iter) + DecodeSnapshotNamespaceVisitor(bufferlist::const_iterator &iter) : m_iter(iter) { } @@ -427,7 +427,7 @@ public: t.decode(m_iter); } private: - bufferlist::iterator &m_iter; + bufferlist::const_iterator &m_iter; }; class DumpSnapshotNamespaceVisitor : public boost::static_visitor { @@ -471,7 +471,7 @@ void SnapshotInfo::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void SnapshotInfo::decode(bufferlist::iterator& it) { +void SnapshotInfo::decode(bufferlist::const_iterator& it) { DECODE_START(1, it); decode(id, it); decode(snapshot_namespace, it); @@ -511,7 +511,7 @@ void SnapshotNamespace::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void SnapshotNamespace::decode(bufferlist::iterator &p) +void SnapshotNamespace::decode(bufferlist::const_iterator &p) { DECODE_START(1, p); uint32_t snap_type; @@ -601,7 +601,7 @@ void ImageSnapshotSpec::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void ImageSnapshotSpec::decode(bufferlist::iterator& it) { +void ImageSnapshotSpec::decode(bufferlist::const_iterator& it) { using ceph::decode; DECODE_START(1, it); decode(pool, it); @@ -631,7 +631,7 @@ void GroupSnapshot::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void GroupSnapshot::decode(bufferlist::iterator& it) { +void GroupSnapshot::decode(bufferlist::const_iterator& it) { using ceph::decode; DECODE_START(1, it); decode(id, it); @@ -660,7 +660,7 @@ void TrashImageSpec::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void TrashImageSpec::decode(bufferlist::iterator &it) { +void TrashImageSpec::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(source, it); decode(name, it); @@ -690,7 +690,7 @@ void MirrorImageMap::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void MirrorImageMap::decode(bufferlist::iterator &it) { +void MirrorImageMap::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(instance_id, it); decode(mapped_time, it); diff --git a/src/cls/rbd/cls_rbd_types.h b/src/cls/rbd/cls_rbd_types.h index 3d61a6678864..f557a2c30e60 100644 --- a/src/cls/rbd/cls_rbd_types.h +++ b/src/cls/rbd/cls_rbd_types.h @@ -42,7 +42,7 @@ inline void encode(const GroupImageLinkState &state, bufferlist& bl, encode(static_cast(state), bl); } -inline void decode(GroupImageLinkState &state, bufferlist::iterator& it) +inline void decode(GroupImageLinkState &state, bufferlist::const_iterator& it) { uint8_t int_state; using ceph::decode; @@ -69,7 +69,7 @@ struct MirrorPeer { } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -97,7 +97,7 @@ struct MirrorImage { MirrorImageState state = MIRROR_IMAGE_STATE_DISABLING; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -128,7 +128,7 @@ inline void encode(const MirrorImageStatusState &state, bufferlist& bl, encode(static_cast(state), bl); } -inline void decode(MirrorImageStatusState &state, bufferlist::iterator& it) +inline void decode(MirrorImageStatusState &state, bufferlist::const_iterator& it) { uint8_t int_state; using ceph::decode; @@ -148,7 +148,7 @@ struct MirrorImageStatus { bool up = false; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; std::string state_to_string() const; @@ -173,7 +173,7 @@ struct ChildImageSpec { } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -205,7 +205,7 @@ struct GroupImageSpec { int64_t pool_id = -1; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -230,7 +230,7 @@ struct GroupImageStatus { GroupImageLinkState state = GROUP_IMAGE_LINK_STATE_INCOMPLETE; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -249,7 +249,7 @@ struct GroupSpec { int64_t pool_id = -1; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; bool is_valid() const; @@ -271,7 +271,7 @@ struct UserSnapshotNamespace { UserSnapshotNamespace() {} void encode(bufferlist& bl) const {} - void decode(bufferlist::iterator& it) {} + void decode(bufferlist::const_iterator& it) {} void dump(Formatter *f) const {} @@ -301,7 +301,7 @@ struct GroupSnapshotNamespace { string group_snapshot_id; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; @@ -338,7 +338,7 @@ struct TrashSnapshotNamespace { original_snapshot_namespace_type(original_snapshot_namespace_type) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; inline bool operator==(const TrashSnapshotNamespace& usn) const { @@ -356,7 +356,7 @@ struct UnknownSnapshotNamespace { UnknownSnapshotNamespace() {} void encode(bufferlist& bl) const {} - void decode(bufferlist::iterator& it) {} + void decode(bufferlist::const_iterator& it) {} void dump(Formatter *f) const {} inline bool operator==(const UnknownSnapshotNamespace& gsn) const { @@ -388,7 +388,7 @@ struct SnapshotNamespace : public SnapshotNamespaceVariant { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -425,7 +425,7 @@ struct SnapshotInfo { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -443,7 +443,7 @@ inline void encode(const GroupSnapshotState &state, bufferlist& bl, uint64_t fea encode(static_cast(state), bl); } -inline void decode(GroupSnapshotState &state, bufferlist::iterator& it) +inline void decode(GroupSnapshotState &state, bufferlist::const_iterator& it) { using ceph::decode; uint8_t int_state; @@ -464,7 +464,7 @@ struct ImageSnapshotSpec { snap_id(_snap_id) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; @@ -487,7 +487,7 @@ struct GroupSnapshot { vector snaps; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -505,7 +505,7 @@ inline void encode(const TrashImageSource &source, bufferlist& bl, encode(static_cast(source), bl); } -inline void decode(TrashImageSource &source, bufferlist::iterator& it) +inline void decode(TrashImageSource &source, bufferlist::const_iterator& it) { uint8_t int_source; using ceph::decode; @@ -528,7 +528,7 @@ struct TrashImageSpec { } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; inline bool operator==(const TrashImageSpec& rhs) const { @@ -556,7 +556,7 @@ struct MirrorImageMap { bufferlist data; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc index cbd4be98d58d..ca8c3e3ac2a4 100644 --- a/src/librbd/ImageWatcher.cc +++ b/src/librbd/ImageWatcher.cc @@ -941,7 +941,7 @@ void ImageWatcher::handle_notify(uint64_t notify_id, uint64_t handle, notify_message = NotifyMessage(HeaderUpdatePayload()); } else { try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(notify_message, iter); } catch (const buffer::error &err) { lderr(m_image_ctx.cct) << this << " error decoding image notification: " diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc index 961c1943eb0f..e9f04ab453bf 100644 --- a/src/librbd/Journal.cc +++ b/src/librbd/Journal.cc @@ -183,7 +183,7 @@ struct GetTagsRequest { } librbd::journal::ClientData client_data; - bufferlist::iterator bl_it = client->data.begin(); + auto bl_it = client->data.cbegin(); try { decode(client_data, bl_it); } catch (const buffer::error &err) { @@ -1220,7 +1220,7 @@ void Journal::handle_replay_ready() { } bufferlist data = replay_entry.get_data(); - bufferlist::iterator it = data.begin(); + auto it = data.cbegin(); journal::EventEntry event_entry; int r = m_journal_replay->decode(&it, &event_entry); @@ -1590,7 +1590,7 @@ int Journal::check_resync_requested(bool *do_resync) { } librbd::journal::ClientData client_data; - bufferlist::iterator bl_it = client.data.begin(); + auto bl_it = client.data.cbegin(); try { decode(client_data, bl_it); } catch (const buffer::error &err) { diff --git a/src/librbd/MirroringWatcher.cc b/src/librbd/MirroringWatcher.cc index 200b405f1bd9..eadfb55cd273 100644 --- a/src/librbd/MirroringWatcher.cc +++ b/src/librbd/MirroringWatcher.cc @@ -97,7 +97,7 @@ void MirroringWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(notify_message, iter); } catch (const buffer::error &err) { lderr(cct) << ": error decoding image notification: " << err.what() diff --git a/src/librbd/TrashWatcher.cc b/src/librbd/TrashWatcher.cc index 1d91ea4ed6a1..a4f7ee118483 100644 --- a/src/librbd/TrashWatcher.cc +++ b/src/librbd/TrashWatcher.cc @@ -72,7 +72,7 @@ void TrashWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(notify_message, iter); } catch (const buffer::error &err) { lderr(cct) << "error decoding image notification: " << err.what() diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc index f4f80fcbc9c2..432d5c75dad2 100644 --- a/src/librbd/WatchNotifyTypes.cc +++ b/src/librbd/WatchNotifyTypes.cc @@ -52,7 +52,7 @@ void AsyncRequestId::encode(bufferlist &bl) const { encode(request_id, bl); } -void AsyncRequestId::decode(bufferlist::iterator &iter) { +void AsyncRequestId::decode(bufferlist::const_iterator &iter) { using ceph::decode; decode(client_id, iter); decode(request_id, iter); @@ -70,7 +70,7 @@ void AcquiredLockPayload::encode(bufferlist &bl) const { encode(client_id, bl); } -void AcquiredLockPayload::decode(__u8 version, bufferlist::iterator &iter) { +void AcquiredLockPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; if (version >= 2) { decode(client_id, iter); @@ -88,7 +88,7 @@ void ReleasedLockPayload::encode(bufferlist &bl) const { encode(client_id, bl); } -void ReleasedLockPayload::decode(__u8 version, bufferlist::iterator &iter) { +void ReleasedLockPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; if (version >= 2) { decode(client_id, iter); @@ -107,7 +107,7 @@ void RequestLockPayload::encode(bufferlist &bl) const { encode(force, bl); } -void RequestLockPayload::decode(__u8 version, bufferlist::iterator &iter) { +void RequestLockPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; if (version >= 2) { decode(client_id, iter); @@ -127,7 +127,7 @@ void RequestLockPayload::dump(Formatter *f) const { void HeaderUpdatePayload::encode(bufferlist &bl) const { } -void HeaderUpdatePayload::decode(__u8 version, bufferlist::iterator &iter) { +void HeaderUpdatePayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void HeaderUpdatePayload::dump(Formatter *f) const { @@ -138,7 +138,7 @@ void AsyncRequestPayloadBase::encode(bufferlist &bl) const { encode(async_request_id, bl); } -void AsyncRequestPayloadBase::decode(__u8 version, bufferlist::iterator &iter) { +void AsyncRequestPayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(async_request_id, iter); } @@ -156,7 +156,7 @@ void AsyncProgressPayload::encode(bufferlist &bl) const { encode(total, bl); } -void AsyncProgressPayload::decode(__u8 version, bufferlist::iterator &iter) { +void AsyncProgressPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; AsyncRequestPayloadBase::decode(version, iter); decode(offset, iter); @@ -175,7 +175,7 @@ void AsyncCompletePayload::encode(bufferlist &bl) const { encode(result, bl); } -void AsyncCompletePayload::decode(__u8 version, bufferlist::iterator &iter) { +void AsyncCompletePayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; AsyncRequestPayloadBase::decode(version, iter); decode(result, iter); @@ -193,7 +193,7 @@ void ResizePayload::encode(bufferlist &bl) const { encode(allow_shrink, bl); } -void ResizePayload::decode(__u8 version, bufferlist::iterator &iter) { +void ResizePayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(size, iter); AsyncRequestPayloadBase::decode(version, iter); @@ -215,7 +215,7 @@ void SnapPayloadBase::encode(bufferlist &bl) const { encode(snap_namespace, bl); } -void SnapPayloadBase::decode(__u8 version, bufferlist::iterator &iter) { +void SnapPayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(snap_name, iter); if (version >= 6) { @@ -232,7 +232,7 @@ void SnapCreatePayload::encode(bufferlist &bl) const { SnapPayloadBase::encode(bl); } -void SnapCreatePayload::decode(__u8 version, bufferlist::iterator &iter) { +void SnapCreatePayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; SnapPayloadBase::decode(version, iter); if (version == 5) { @@ -250,7 +250,7 @@ void SnapRenamePayload::encode(bufferlist &bl) const { SnapPayloadBase::encode(bl); } -void SnapRenamePayload::decode(__u8 version, bufferlist::iterator &iter) { +void SnapRenamePayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(snap_id, iter); SnapPayloadBase::decode(version, iter); @@ -266,7 +266,7 @@ void RenamePayload::encode(bufferlist &bl) const { encode(image_name, bl); } -void RenamePayload::decode(__u8 version, bufferlist::iterator &iter) { +void RenamePayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(image_name, iter); } @@ -281,7 +281,7 @@ void UpdateFeaturesPayload::encode(bufferlist &bl) const { encode(enabled, bl); } -void UpdateFeaturesPayload::decode(__u8 version, bufferlist::iterator &iter) { +void UpdateFeaturesPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(features, iter); decode(enabled, iter); @@ -296,7 +296,7 @@ void UnknownPayload::encode(bufferlist &bl) const { ceph_abort(); } -void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) { +void UnknownPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void UnknownPayload::dump(Formatter *f) const { @@ -312,7 +312,7 @@ void NotifyMessage::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void NotifyMessage::decode(bufferlist::iterator& iter) { +void NotifyMessage::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; @@ -410,7 +410,7 @@ void ResponseMessage::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void ResponseMessage::decode(bufferlist::iterator& iter) { +void ResponseMessage::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); decode(result, iter); DECODE_FINISH(iter); diff --git a/src/librbd/WatchNotifyTypes.h b/src/librbd/WatchNotifyTypes.h index c4bbebdfd756..6c13804d0705 100644 --- a/src/librbd/WatchNotifyTypes.h +++ b/src/librbd/WatchNotifyTypes.h @@ -33,7 +33,7 @@ struct AsyncRequestId { : client_id(client_id_), request_id(request_id_) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; inline bool operator<(const AsyncRequestId &rhs) const { @@ -77,7 +77,7 @@ struct AcquiredLockPayload { AcquiredLockPayload(const ClientId &client_id_) : client_id(client_id_) {} void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -91,7 +91,7 @@ struct ReleasedLockPayload { ReleasedLockPayload(const ClientId &client_id_) : client_id(client_id_) {} void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -108,7 +108,7 @@ struct RequestLockPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -117,7 +117,7 @@ struct HeaderUpdatePayload { static const bool CHECK_FOR_REFRESH = false; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -126,7 +126,7 @@ public: AsyncRequestId async_request_id; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; protected: @@ -146,7 +146,7 @@ struct AsyncProgressPayload : public AsyncRequestPayloadBase { uint64_t total; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -161,7 +161,7 @@ struct AsyncCompletePayload : public AsyncRequestPayloadBase { int result; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -185,7 +185,7 @@ struct ResizePayload : public AsyncRequestPayloadBase { bool allow_shrink; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -197,7 +197,7 @@ public: std::string snap_name; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; protected: @@ -216,7 +216,7 @@ struct SnapCreatePayload : public SnapPayloadBase { : SnapPayloadBase(_snap_namespace, name) {} void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -231,7 +231,7 @@ struct SnapRenamePayload : public SnapPayloadBase { uint64_t snap_id = 0; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -281,7 +281,7 @@ struct RenamePayload { std::string image_name; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -297,7 +297,7 @@ struct UpdateFeaturesPayload { bool enabled; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -306,7 +306,7 @@ struct UnknownPayload { static const bool CHECK_FOR_REFRESH = false; void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -337,7 +337,7 @@ struct NotifyMessage { bool check_for_refresh() const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; NotifyOp get_notify_op() const; @@ -351,7 +351,7 @@ struct ResponseMessage { int result; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/librbd/deep_copy/MetadataCopyRequest.cc b/src/librbd/deep_copy/MetadataCopyRequest.cc index 9f786087b354..cbce9a19eace 100644 --- a/src/librbd/deep_copy/MetadataCopyRequest.cc +++ b/src/librbd/deep_copy/MetadataCopyRequest.cc @@ -57,7 +57,7 @@ void MetadataCopyRequest::handle_list_src_metadata(int r) { Metadata metadata; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = librbd::cls_client::metadata_list_finish(&it, &metadata); } diff --git a/src/librbd/image/CloneRequest.cc b/src/librbd/image/CloneRequest.cc index fa4b62e4714f..5952a51218e6 100644 --- a/src/librbd/image/CloneRequest.cc +++ b/src/librbd/image/CloneRequest.cc @@ -431,7 +431,7 @@ void CloneRequest::handle_metadata_list(int r) { map metadata; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = cls_client::metadata_list_finish(&it, &metadata); } @@ -518,7 +518,7 @@ void CloneRequest::handle_get_mirror_mode(int r) { ldout(m_cct, 20) << this << " " << __func__ << " r=" << r << dendl; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = cls_client::mirror_mode_get_finish(&it, &m_mirror_mode); } diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc index 24b3f608b46e..77e4e850b52d 100644 --- a/src/librbd/image/CreateRequest.cc +++ b/src/librbd/image/CreateRequest.cc @@ -489,7 +489,7 @@ void CreateRequest::handle_negotiate_features(int r) { uint64_t all_features; if (r >= 0) { - bufferlist::iterator it = m_outbl.begin(); + auto it = m_outbl.cbegin(); r = cls_client::get_all_features_finish(&it, &all_features); } if (r < 0) { @@ -657,7 +657,7 @@ void CreateRequest::handle_fetch_mirror_mode(int r) { cls::rbd::MirrorMode mirror_mode_internal = cls::rbd::MIRROR_MODE_DISABLED; if (r == 0) { - bufferlist::iterator it = m_outbl.begin(); + auto it = m_outbl.cbegin(); r = cls_client::mirror_mode_get_finish(&it, &mirror_mode_internal); if (r < 0) { lderr(m_cct) << "Failed to retrieve mirror mode" << dendl; diff --git a/src/librbd/image/OpenRequest.cc b/src/librbd/image/OpenRequest.cc index 26e909f89242..33642f12c1d4 100644 --- a/src/librbd/image/OpenRequest.cc +++ b/src/librbd/image/OpenRequest.cc @@ -136,7 +136,7 @@ Context *OpenRequest::handle_v2_get_id(int *result) { ldout(cct, 10) << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::get_id_finish(&it, &m_image_ctx->id); } if (*result < 0) { @@ -171,7 +171,7 @@ Context *OpenRequest::handle_v2_get_name(int *result) { ldout(cct, 10) << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::dir_get_name_finish(&it, &m_image_ctx->name); } if (*result < 0 && *result != -ENOENT) { @@ -212,7 +212,7 @@ Context *OpenRequest::handle_v2_get_name_from_trash(int *result) { cls::rbd::TrashImageSpec trash_spec; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::trash_get_finish(&it, &trash_spec); m_image_ctx->name = trash_spec.name; } @@ -261,7 +261,7 @@ Context *OpenRequest::handle_v2_get_initial_metadata(int *result) { ldout(cct, 10) << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::get_initial_metadata_finish( &it, &m_image_ctx->object_prefix, &m_image_ctx->order, &m_image_ctx->features); } @@ -304,7 +304,7 @@ Context *OpenRequest::handle_v2_get_stripe_unit_count(int *result) { ldout(cct, 10) << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::get_stripe_unit_count_finish( &it, &m_image_ctx->stripe_unit, &m_image_ctx->stripe_count); } @@ -347,7 +347,7 @@ Context *OpenRequest::handle_v2_get_create_timestamp(int *result) { ldout(cct, 10) << this << " " << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::get_create_timestamp_finish(&it, &m_image_ctx->create_timestamp); } @@ -387,7 +387,7 @@ Context *OpenRequest::handle_v2_get_data_pool(int *result) { int64_t data_pool_id = -1; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::get_data_pool_finish(&it, &data_pool_id); } else if (*result == -EOPNOTSUPP) { *result = 0; diff --git a/src/librbd/image/RefreshRequest.cc b/src/librbd/image/RefreshRequest.cc index 24a2910caf94..2afee7a2aad5 100644 --- a/src/librbd/image/RefreshRequest.cc +++ b/src/librbd/image/RefreshRequest.cc @@ -138,7 +138,7 @@ Context *RefreshRequest::handle_v1_get_snapshots(int *result) { std::vector snap_names; std::vector snap_sizes; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::old_snapshot_list_finish(&it, &snap_names, &snap_sizes, &m_snapc); } @@ -195,7 +195,7 @@ Context *RefreshRequest::handle_v1_get_locks(int *result) { if (*result == -EOPNOTSUPP) { *result = 0; } else if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); ClsLockType lock_type; *result = rados::cls::lock::get_lock_info_finish(&it, &m_lockers, &lock_type, &m_lock_tag); @@ -266,7 +266,7 @@ Context *RefreshRequest::handle_v2_get_mutable_metadata(int *result) { << "r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::get_mutable_metadata_finish(&it, &m_size, &m_features, &m_incompatible_features, &m_lockers, @@ -328,7 +328,7 @@ Context *RefreshRequest::handle_v2_get_metadata(int *result) { std::map metadata; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::metadata_list_finish(&it, &metadata); } @@ -383,7 +383,7 @@ Context *RefreshRequest::handle_v2_get_flags(int *result) { if (*result == 0) { /// NOTE: remove support for snap paramter after Luminous is retired - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); cls_client::get_flags_finish(&it, &m_flags, m_snapc.snaps, &m_snap_flags); } if (*result == -EOPNOTSUPP) { @@ -443,7 +443,7 @@ Context *RefreshRequest::handle_v2_get_op_features(int *result) { // -EOPNOTSUPP handler not required since feature bit implies OSD // supports the method if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); cls_client::op_features_get_finish(&it, &m_op_features); } else if (*result < 0) { lderr(cct) << "failed to retrieve op features: " << cpp_strerror(*result) @@ -480,7 +480,7 @@ Context *RefreshRequest::handle_v2_get_group(int *result) { << "r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); cls_client::image_group_get_finish(&it, &m_group_spec); } if (*result == -EOPNOTSUPP) { @@ -530,7 +530,7 @@ Context *RefreshRequest::handle_v2_get_snapshots(int *result) { << "r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::snapshot_get_finish(&it, m_snapc.snaps, &m_snap_infos, &m_snap_parents, &m_snap_protection); @@ -582,7 +582,7 @@ Context *RefreshRequest::handle_v2_get_snapshots_legacy(int *result) { std::vector snap_names; std::vector snap_sizes; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::snapshot_list_finish(&it, m_snapc.snaps, &snap_names, &snap_sizes, &m_snap_parents, @@ -636,7 +636,7 @@ Context *RefreshRequest::handle_v2_get_snap_timestamps(int *result) { std::vector snap_timestamps; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::snapshot_timestamp_list_finish(&it, m_snapc.snaps, &snap_timestamps); } diff --git a/src/librbd/image/RemoveRequest.cc b/src/librbd/image/RemoveRequest.cc index 738d7dce0c8c..5a5cead82e5f 100644 --- a/src/librbd/image/RemoveRequest.cc +++ b/src/librbd/image/RemoveRequest.cc @@ -346,7 +346,7 @@ void RemoveRequest::handle_check_group(int r) { cls::rbd::GroupSpec s; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = librbd::cls_client::image_group_get_finish(&it, &s); } if (r < 0 && r != -EOPNOTSUPP) { @@ -760,7 +760,7 @@ void RemoveRequest::handle_dir_get_image_id(int r) { } if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = librbd::cls_client::dir_get_id_finish(&iter, &m_image_id); if (r < 0) { finish(r); @@ -799,7 +799,7 @@ void RemoveRequest::handle_dir_get_image_name(int r) { } if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = librbd::cls_client::dir_get_name_finish(&iter, &m_image_name); if (r < 0) { finish(r); diff --git a/src/librbd/image_watcher/NotifyLockOwner.cc b/src/librbd/image_watcher/NotifyLockOwner.cc index 5e03650bb497..2cec8b1bc894 100644 --- a/src/librbd/image_watcher/NotifyLockOwner.cc +++ b/src/librbd/image_watcher/NotifyLockOwner.cc @@ -73,7 +73,7 @@ void NotifyLockOwner::handle_notify(int r) { } try { - bufferlist::iterator iter = response.begin(); + auto iter = response.cbegin(); ResponseMessage response_message; using ceph::decode; diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 7a9f7267b468..b8291ebdea6e 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -529,7 +529,7 @@ bool compare_by_name(const child_info_t& c1, const child_info_t& c2) // old format images are in a tmap if (bl.length()) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); bufferlist header; map m; decode(header, p); diff --git a/src/librbd/journal/OpenRequest.cc b/src/librbd/journal/OpenRequest.cc index aa6cc43a09c0..a5178de804c4 100644 --- a/src/librbd/journal/OpenRequest.cc +++ b/src/librbd/journal/OpenRequest.cc @@ -72,7 +72,7 @@ void OpenRequest::handle_init(int r) { } librbd::journal::ClientData client_data; - bufferlist::iterator bl = client.data.begin(); + auto bl = client.data.cbegin(); try { decode(client_data, bl); } catch (const buffer::error &err) { diff --git a/src/librbd/journal/Replay.cc b/src/librbd/journal/Replay.cc index 2f33ab5e915f..226f8777782f 100644 --- a/src/librbd/journal/Replay.cc +++ b/src/librbd/journal/Replay.cc @@ -187,7 +187,7 @@ Replay::~Replay() { } template -int Replay::decode(bufferlist::iterator *it, EventEntry *event_entry) { +int Replay::decode(bufferlist::const_iterator *it, EventEntry *event_entry) { try { using ceph::decode; decode(*event_entry, *it); diff --git a/src/librbd/journal/Replay.h b/src/librbd/journal/Replay.h index 4a4260cb9f00..cf0e999b43db 100644 --- a/src/librbd/journal/Replay.h +++ b/src/librbd/journal/Replay.h @@ -32,7 +32,7 @@ public: Replay(ImageCtxT &image_ctx); ~Replay(); - int decode(bufferlist::iterator *it, EventEntry *event_entry); + int decode(bufferlist::const_iterator *it, EventEntry *event_entry); void process(const EventEntry &event_entry, Context *on_ready, Context *on_safe); diff --git a/src/librbd/journal/Types.cc b/src/librbd/journal/Types.cc index b5f10e46d2f1..03e62660bc61 100644 --- a/src/librbd/journal/Types.cc +++ b/src/librbd/journal/Types.cc @@ -40,7 +40,7 @@ private: class DecodeVisitor : public boost::static_visitor { public: - DecodeVisitor(__u8 version, bufferlist::iterator &iter) + DecodeVisitor(__u8 version, bufferlist::const_iterator &iter) : m_version(version), m_iter(iter) { } @@ -50,7 +50,7 @@ public: } private: __u8 m_version; - bufferlist::iterator &m_iter; + bufferlist::const_iterator &m_iter; }; class DumpVisitor : public boost::static_visitor { @@ -78,7 +78,7 @@ void AioDiscardEvent::encode(bufferlist& bl) const { encode(skip_partial_discard, bl); } -void AioDiscardEvent::decode(__u8 version, bufferlist::iterator& it) { +void AioDiscardEvent::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(offset, it); decode(length, it); @@ -104,7 +104,7 @@ void AioWriteEvent::encode(bufferlist& bl) const { encode(data, bl); } -void AioWriteEvent::decode(__u8 version, bufferlist::iterator& it) { +void AioWriteEvent::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(offset, it); decode(length, it); @@ -123,7 +123,7 @@ void AioWriteSameEvent::encode(bufferlist& bl) const { encode(data, bl); } -void AioWriteSameEvent::decode(__u8 version, bufferlist::iterator& it) { +void AioWriteSameEvent::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(offset, it); decode(length, it); @@ -147,7 +147,7 @@ void AioCompareAndWriteEvent::encode(bufferlist& bl) const { encode(write_data, bl); } -void AioCompareAndWriteEvent::decode(__u8 version, bufferlist::iterator& it) { +void AioCompareAndWriteEvent::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(offset, it); decode(length, it); @@ -163,7 +163,7 @@ void AioCompareAndWriteEvent::dump(Formatter *f) const { void AioFlushEvent::encode(bufferlist& bl) const { } -void AioFlushEvent::decode(__u8 version, bufferlist::iterator& it) { +void AioFlushEvent::decode(__u8 version, bufferlist::const_iterator& it) { } void AioFlushEvent::dump(Formatter *f) const { @@ -174,7 +174,7 @@ void OpEventBase::encode(bufferlist& bl) const { encode(op_tid, bl); } -void OpEventBase::decode(__u8 version, bufferlist::iterator& it) { +void OpEventBase::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(op_tid, it); } @@ -190,7 +190,7 @@ void OpFinishEvent::encode(bufferlist& bl) const { encode(r, bl); } -void OpFinishEvent::decode(__u8 version, bufferlist::iterator& it) { +void OpFinishEvent::decode(__u8 version, bufferlist::const_iterator& it) { OpEventBase::decode(version, it); using ceph::decode; decode(op_tid, it); @@ -210,7 +210,7 @@ void SnapEventBase::encode(bufferlist& bl) const { encode(snap_namespace, bl); } -void SnapEventBase::decode(__u8 version, bufferlist::iterator& it) { +void SnapEventBase::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; OpEventBase::decode(version, it); using ceph::decode; @@ -230,7 +230,7 @@ void SnapCreateEvent::encode(bufferlist &bl) const { SnapEventBase::encode(bl); } -void SnapCreateEvent::decode(__u8 version, bufferlist::iterator& it) { +void SnapCreateEvent::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; SnapEventBase::decode(version, it); if (version == 3) { @@ -248,7 +248,7 @@ void SnapLimitEvent::encode(bufferlist &bl) const { encode(limit, bl); } -void SnapLimitEvent::decode(__u8 version, bufferlist::iterator& it) { +void SnapLimitEvent::decode(__u8 version, bufferlist::const_iterator& it) { OpEventBase::decode(version, it); using ceph::decode; decode(limit, it); @@ -267,7 +267,7 @@ void SnapRenameEvent::encode(bufferlist& bl) const { encode(src_snap_name, bl); } -void SnapRenameEvent::decode(__u8 version, bufferlist::iterator& it) { +void SnapRenameEvent::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; OpEventBase::decode(version, it); decode(dst_snap_name, it); @@ -290,7 +290,7 @@ void RenameEvent::encode(bufferlist& bl) const { encode(image_name, bl); } -void RenameEvent::decode(__u8 version, bufferlist::iterator& it) { +void RenameEvent::decode(__u8 version, bufferlist::const_iterator& it) { OpEventBase::decode(version, it); using ceph::decode; decode(image_name, it); @@ -307,7 +307,7 @@ void ResizeEvent::encode(bufferlist& bl) const { encode(size, bl); } -void ResizeEvent::decode(__u8 version, bufferlist::iterator& it) { +void ResizeEvent::decode(__u8 version, bufferlist::const_iterator& it) { OpEventBase::decode(version, it); using ceph::decode; decode(size, it); @@ -321,7 +321,7 @@ void ResizeEvent::dump(Formatter *f) const { void DemotePromoteEvent::encode(bufferlist& bl) const { } -void DemotePromoteEvent::decode(__u8 version, bufferlist::iterator& it) { +void DemotePromoteEvent::decode(__u8 version, bufferlist::const_iterator& it) { } void DemotePromoteEvent::dump(Formatter *f) const { @@ -334,7 +334,7 @@ void UpdateFeaturesEvent::encode(bufferlist& bl) const { encode(enabled, bl); } -void UpdateFeaturesEvent::decode(__u8 version, bufferlist::iterator& it) { +void UpdateFeaturesEvent::decode(__u8 version, bufferlist::const_iterator& it) { OpEventBase::decode(version, it); using ceph::decode; decode(features, it); @@ -354,7 +354,7 @@ void MetadataSetEvent::encode(bufferlist& bl) const { encode(value, bl); } -void MetadataSetEvent::decode(__u8 version, bufferlist::iterator& it) { +void MetadataSetEvent::decode(__u8 version, bufferlist::const_iterator& it) { OpEventBase::decode(version, it); using ceph::decode; decode(key, it); @@ -373,7 +373,7 @@ void MetadataRemoveEvent::encode(bufferlist& bl) const { encode(key, bl); } -void MetadataRemoveEvent::decode(__u8 version, bufferlist::iterator& it) { +void MetadataRemoveEvent::decode(__u8 version, bufferlist::const_iterator& it) { OpEventBase::decode(version, it); using ceph::decode; decode(key, it); @@ -388,7 +388,7 @@ void UnknownEvent::encode(bufferlist& bl) const { ceph_abort(); } -void UnknownEvent::decode(__u8 version, bufferlist::iterator& it) { +void UnknownEvent::decode(__u8 version, bufferlist::const_iterator& it) { } void UnknownEvent::dump(Formatter *f) const { @@ -405,7 +405,7 @@ void EventEntry::encode(bufferlist& bl) const { encode_metadata(bl); } -void EventEntry::decode(bufferlist::iterator& it) { +void EventEntry::decode(bufferlist::const_iterator& it) { DECODE_START(1, it); uint32_t event_type; @@ -493,7 +493,7 @@ void EventEntry::encode_metadata(bufferlist& bl) const { ENCODE_FINISH(bl); } -void EventEntry::decode_metadata(bufferlist::iterator& it) { +void EventEntry::decode_metadata(bufferlist::const_iterator& it) { DECODE_START(1, it); decode(timestamp, it); DECODE_FINISH(it); @@ -559,7 +559,7 @@ void ImageClientMeta::encode(bufferlist& bl) const { encode(resync_requested, bl); } -void ImageClientMeta::decode(__u8 version, bufferlist::iterator& it) { +void ImageClientMeta::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(tag_class, it); decode(resync_requested, it); @@ -578,7 +578,7 @@ void MirrorPeerSyncPoint::encode(bufferlist& bl) const { encode(snap_namespace, bl); } -void MirrorPeerSyncPoint::decode(__u8 version, bufferlist::iterator& it) { +void MirrorPeerSyncPoint::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(snap_name, it); decode(from_snap_name, it); @@ -609,7 +609,7 @@ void MirrorPeerClientMeta::encode(bufferlist& bl) const { encode(snap_seqs, bl); } -void MirrorPeerClientMeta::decode(__u8 version, bufferlist::iterator& it) { +void MirrorPeerClientMeta::decode(__u8 version, bufferlist::const_iterator& it) { using ceph::decode; decode(image_id, it); @@ -653,7 +653,7 @@ void MirrorPeerClientMeta::dump(Formatter *f) const { void CliClientMeta::encode(bufferlist& bl) const { } -void CliClientMeta::decode(__u8 version, bufferlist::iterator& it) { +void CliClientMeta::decode(__u8 version, bufferlist::const_iterator& it) { } void CliClientMeta::dump(Formatter *f) const { @@ -663,7 +663,7 @@ void UnknownClientMeta::encode(bufferlist& bl) const { ceph_abort(); } -void UnknownClientMeta::decode(__u8 version, bufferlist::iterator& it) { +void UnknownClientMeta::decode(__u8 version, bufferlist::const_iterator& it) { } void UnknownClientMeta::dump(Formatter *f) const { @@ -679,7 +679,7 @@ void ClientData::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void ClientData::decode(bufferlist::iterator& it) { +void ClientData::decode(bufferlist::const_iterator& it) { DECODE_START(1, it); uint32_t client_meta_type; @@ -729,7 +729,7 @@ void TagPredecessor::encode(bufferlist& bl) const { encode(entry_tid, bl); } -void TagPredecessor::decode(bufferlist::iterator& it) { +void TagPredecessor::decode(bufferlist::const_iterator& it) { using ceph::decode; decode(mirror_uuid, it); decode(commit_valid, it); @@ -750,7 +750,7 @@ void TagData::encode(bufferlist& bl) const { predecessor.encode(bl); } -void TagData::decode(bufferlist::iterator& it) { +void TagData::decode(bufferlist::const_iterator& it) { using ceph::decode; decode(mirror_uuid, it); predecessor.decode(it); diff --git a/src/librbd/journal/Types.h b/src/librbd/journal/Types.h index b42c8d54ebc1..2486d416e292 100644 --- a/src/librbd/journal/Types.h +++ b/src/librbd/journal/Types.h @@ -62,7 +62,7 @@ struct AioDiscardEvent { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -82,7 +82,7 @@ struct AioWriteEvent { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -101,7 +101,7 @@ struct AioWriteSameEvent { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -123,7 +123,7 @@ struct AioCompareAndWriteEvent { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -131,7 +131,7 @@ struct AioFlushEvent { static const EventType TYPE = EVENT_TYPE_AIO_FLUSH; void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -145,7 +145,7 @@ protected: } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -160,7 +160,7 @@ struct OpFinishEvent : public OpEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -179,7 +179,7 @@ protected: } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -194,7 +194,7 @@ struct SnapCreateEvent : public SnapEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -232,7 +232,7 @@ struct SnapRenameEvent : public OpEventBase{ } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -277,7 +277,7 @@ struct SnapLimitEvent : public OpEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -308,7 +308,7 @@ struct RenameEvent : public OpEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -324,7 +324,7 @@ struct ResizeEvent : public OpEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -346,7 +346,7 @@ struct DemotePromoteEvent { EVENT_TYPE_DEMOTE_PROMOTE); void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -363,7 +363,7 @@ struct UpdateFeaturesEvent : public OpEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -380,7 +380,7 @@ struct MetadataSetEvent : public OpEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -396,7 +396,7 @@ struct MetadataRemoveEvent : public OpEventBase { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -404,7 +404,7 @@ struct UnknownEvent { static const EventType TYPE = static_cast(-1); void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -448,7 +448,7 @@ struct EventEntry { EventType get_event_type() const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -458,7 +458,7 @@ private: static const uint32_t METADATA_FIXED_SIZE = 14; /// version encoding, timestamp void encode_metadata(bufferlist& bl) const; - void decode_metadata(bufferlist::iterator& it); + void decode_metadata(bufferlist::const_iterator& it); }; // Journal Client data structures @@ -481,7 +481,7 @@ struct ImageClientMeta { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -516,7 +516,7 @@ struct MirrorPeerSyncPoint { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -553,7 +553,7 @@ struct MirrorPeerClientMeta { } void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -561,7 +561,7 @@ struct CliClientMeta { static const ClientMetaType TYPE = CLI_CLIENT_META_TYPE; void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -569,7 +569,7 @@ struct UnknownClientMeta { static const ClientMetaType TYPE = static_cast(-1); void encode(bufferlist& bl) const; - void decode(__u8 version, bufferlist::iterator& it); + void decode(__u8 version, bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -589,7 +589,7 @@ struct ClientData { ClientMetaType get_client_meta_type() const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -619,7 +619,7 @@ struct TagPredecessor { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; }; @@ -644,7 +644,7 @@ struct TagData { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/librbd/journal/Utils.cc b/src/librbd/journal/Utils.cc index efdb17ef88b4..1721a9b2c941 100644 --- a/src/librbd/journal/Utils.cc +++ b/src/librbd/journal/Utils.cc @@ -14,7 +14,7 @@ namespace librbd { namespace journal { namespace util { -int C_DecodeTag::decode(bufferlist::iterator *it, TagData *tag_data) { +int C_DecodeTag::decode(bufferlist::const_iterator *it, TagData *tag_data) { try { using ceph::decode; decode(*tag_data, *it); @@ -35,7 +35,7 @@ int C_DecodeTag::process(int r) { Mutex::Locker locker(*lock); *tag_tid = tag.tid; - bufferlist::iterator data_it = tag.data.begin(); + auto data_it = tag.data.cbegin(); r = decode(&data_it, tag_data); if (r < 0) { lderr(cct) << "C_DecodeTag: " << this << " " << __func__ << ": " @@ -66,7 +66,7 @@ int C_DecodeTags::process(int r) { Mutex::Locker locker(*lock); *tag_tid = tags.back().tid; - bufferlist::iterator data_it = tags.back().data.begin(); + auto data_it = tags.back().data.cbegin(); r = C_DecodeTag::decode(&data_it, tag_data); if (r < 0) { lderr(cct) << "C_DecodeTags: " << this << " " << __func__ << ": " diff --git a/src/librbd/journal/Utils.h b/src/librbd/journal/Utils.h index 0a272bfd3d31..63d37c03726e 100644 --- a/src/librbd/journal/Utils.h +++ b/src/librbd/journal/Utils.h @@ -43,7 +43,7 @@ struct C_DecodeTag : public Context { int process(int r); - static int decode(bufferlist::iterator *it, TagData *tag_data); + static int decode(bufferlist::const_iterator *it, TagData *tag_data); }; diff --git a/src/librbd/managed_lock/GetLockerRequest.cc b/src/librbd/managed_lock/GetLockerRequest.cc index 7a50230b3c01..ede93cba95c9 100644 --- a/src/librbd/managed_lock/GetLockerRequest.cc +++ b/src/librbd/managed_lock/GetLockerRequest.cc @@ -61,7 +61,7 @@ void GetLockerRequest::handle_get_lockers(int r) { ClsLockType lock_type = LOCK_NONE; std::string lock_tag; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = rados::cls::lock::get_lock_info_finish(&it, &lockers, &lock_type, &lock_tag); } diff --git a/src/librbd/mirror/DisableRequest.cc b/src/librbd/mirror/DisableRequest.cc index 7968284792a6..79ccaacc89b0 100644 --- a/src/librbd/mirror/DisableRequest.cc +++ b/src/librbd/mirror/DisableRequest.cc @@ -59,7 +59,7 @@ Context *DisableRequest::handle_get_mirror_image(int *result) { ldout(cct, 10) << this << " " << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); *result = cls_client::mirror_image_get_finish(&iter, &m_mirror_image); } @@ -245,7 +245,7 @@ Context *DisableRequest::handle_get_clients(int *result) { for (auto client : m_clients) { journal::ClientData client_data; - bufferlist::iterator bl_it = client.data.begin(); + auto bl_it = client.data.cbegin(); try { using ceph::decode; decode(client_data, bl_it); diff --git a/src/librbd/mirror/EnableRequest.cc b/src/librbd/mirror/EnableRequest.cc index 431a2085e7a7..b803ee943281 100644 --- a/src/librbd/mirror/EnableRequest.cc +++ b/src/librbd/mirror/EnableRequest.cc @@ -57,7 +57,7 @@ Context *EnableRequest::handle_get_mirror_image(int *result) { ldout(m_cct, 10) << this << " " << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); *result = cls_client::mirror_image_get_finish(&iter, &m_mirror_image); } diff --git a/src/librbd/mirror/GetInfoRequest.cc b/src/librbd/mirror/GetInfoRequest.cc index cc2f033495ce..0d2d87aa1dac 100644 --- a/src/librbd/mirror/GetInfoRequest.cc +++ b/src/librbd/mirror/GetInfoRequest.cc @@ -78,7 +78,7 @@ void GetInfoRequest::handle_get_mirror_image(int r) { m_mirror_image->state = cls::rbd::MIRROR_IMAGE_STATE_DISABLED; *m_promotion_state = PROMOTION_STATE_NON_PRIMARY; if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = cls_client::mirror_image_get_finish(&iter, m_mirror_image); } diff --git a/src/librbd/mirror/GetStatusRequest.cc b/src/librbd/mirror/GetStatusRequest.cc index b21a16a1f8d1..1259ff96017c 100644 --- a/src/librbd/mirror/GetStatusRequest.cc +++ b/src/librbd/mirror/GetStatusRequest.cc @@ -82,7 +82,7 @@ void GetStatusRequest::handle_get_status(int r) { ldout(cct, 20) << "r=" << r << dendl; if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = cls_client::mirror_image_status_get_finish(&iter, m_mirror_image_status); } diff --git a/src/librbd/mirroring_watcher/Types.cc b/src/librbd/mirroring_watcher/Types.cc index ccfb4d036c1a..b723ba87ac8c 100644 --- a/src/librbd/mirroring_watcher/Types.cc +++ b/src/librbd/mirroring_watcher/Types.cc @@ -34,7 +34,7 @@ void ModeUpdatedPayload::encode(bufferlist &bl) const { encode(static_cast(mirror_mode), bl); } -void ModeUpdatedPayload::decode(__u8 version, bufferlist::iterator &iter) { +void ModeUpdatedPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; uint32_t mirror_mode_decode; decode(mirror_mode_decode, iter); @@ -52,7 +52,7 @@ void ImageUpdatedPayload::encode(bufferlist &bl) const { encode(global_image_id, bl); } -void ImageUpdatedPayload::decode(__u8 version, bufferlist::iterator &iter) { +void ImageUpdatedPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; uint32_t mirror_image_state_decode; decode(mirror_image_state_decode, iter); @@ -72,7 +72,7 @@ void UnknownPayload::encode(bufferlist &bl) const { ceph_abort(); } -void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) { +void UnknownPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void UnknownPayload::dump(Formatter *f) const { @@ -84,7 +84,7 @@ void NotifyMessage::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void NotifyMessage::decode(bufferlist::iterator& iter) { +void NotifyMessage::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; diff --git a/src/librbd/mirroring_watcher/Types.h b/src/librbd/mirroring_watcher/Types.h index 16bf5b65e476..1e096a9d384c 100644 --- a/src/librbd/mirroring_watcher/Types.h +++ b/src/librbd/mirroring_watcher/Types.h @@ -35,7 +35,7 @@ struct ModeUpdatedPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -57,7 +57,7 @@ struct ImageUpdatedPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -68,7 +68,7 @@ struct UnknownPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -83,7 +83,7 @@ struct NotifyMessage { Payload payload; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/librbd/object_map/LockRequest.cc b/src/librbd/object_map/LockRequest.cc index 3f97bef37c49..7b143447d2b1 100644 --- a/src/librbd/object_map/LockRequest.cc +++ b/src/librbd/object_map/LockRequest.cc @@ -98,7 +98,7 @@ Context *LockRequest::handle_get_lock_info(int *ret_val) { ClsLockType lock_type; std::string lock_tag; if (*ret_val == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *ret_val = rados::cls::lock::get_lock_info_finish(&it, &m_lockers, &lock_type, &lock_tag); } diff --git a/src/librbd/object_map/RefreshRequest.cc b/src/librbd/object_map/RefreshRequest.cc index 41e5aafba549..2aad847fbc9c 100644 --- a/src/librbd/object_map/RefreshRequest.cc +++ b/src/librbd/object_map/RefreshRequest.cc @@ -116,7 +116,7 @@ Context *RefreshRequest::handle_load(int *ret_val) { ldout(cct, 10) << this << " " << __func__ << ": r=" << *ret_val << dendl; if (*ret_val == 0) { - bufferlist::iterator bl_it = m_out_bl.begin(); + auto bl_it = m_out_bl.cbegin(); *ret_val = cls_client::object_map_load_finish(&bl_it, &m_on_disk_object_map); } diff --git a/src/librbd/object_map/SnapshotRemoveRequest.cc b/src/librbd/object_map/SnapshotRemoveRequest.cc index 0df878e13c39..a092dda5ab23 100644 --- a/src/librbd/object_map/SnapshotRemoveRequest.cc +++ b/src/librbd/object_map/SnapshotRemoveRequest.cc @@ -78,7 +78,7 @@ bool SnapshotRemoveRequest::should_complete(int r) { } if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = cls_client::object_map_load_finish(&it, &m_snap_object_map); } if (r < 0) { diff --git a/src/librbd/operation/DisableFeaturesRequest.cc b/src/librbd/operation/DisableFeaturesRequest.cc index a67bc1e18745..a21efda115ff 100644 --- a/src/librbd/operation/DisableFeaturesRequest.cc +++ b/src/librbd/operation/DisableFeaturesRequest.cc @@ -242,7 +242,7 @@ Context *DisableFeaturesRequest::handle_get_mirror_mode(int *result) { ldout(cct, 20) << this << " " << __func__ << ": r=" << *result << dendl; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::mirror_mode_get_finish(&it, &m_mirror_mode); } @@ -292,7 +292,7 @@ Context *DisableFeaturesRequest::handle_get_mirror_image(int *result) { cls::rbd::MirrorImage mirror_image; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::mirror_image_get_finish(&it, &mirror_image); } diff --git a/src/librbd/operation/EnableFeaturesRequest.cc b/src/librbd/operation/EnableFeaturesRequest.cc index 241b6206d4c9..0f7f7bbe29c0 100644 --- a/src/librbd/operation/EnableFeaturesRequest.cc +++ b/src/librbd/operation/EnableFeaturesRequest.cc @@ -147,7 +147,7 @@ Context *EnableFeaturesRequest::handle_get_mirror_mode(int *result) { cls::rbd::MirrorMode mirror_mode = cls::rbd::MIRROR_MODE_DISABLED; if (*result == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); *result = cls_client::mirror_mode_get_finish(&it, &mirror_mode); } else if (*result == -ENOENT) { *result = 0; diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc index 8e873e146178..1699d3385740 100644 --- a/src/librbd/operation/SnapshotRemoveRequest.cc +++ b/src/librbd/operation/SnapshotRemoveRequest.cc @@ -136,7 +136,7 @@ void SnapshotRemoveRequest::handle_get_snap(int r) { std::vector snap_infos; std::vector parents; std::vector protections; - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = cls_client::snapshot_get_finish(&it, {m_snap_id}, &snap_infos, &parents, &protections); if (r == 0) { diff --git a/src/librbd/operation/SnapshotUnprotectRequest.cc b/src/librbd/operation/SnapshotUnprotectRequest.cc index dede6d6e4686..7d58f7eb0719 100644 --- a/src/librbd/operation/SnapshotUnprotectRequest.cc +++ b/src/librbd/operation/SnapshotUnprotectRequest.cc @@ -116,7 +116,7 @@ protected: CephContext *cct = image_ctx.cct; if (r == 0) { - bufferlist::iterator it = m_children_bl.begin(); + auto it = m_children_bl.cbegin(); r= cls_client::get_children_finish(&it, &m_children); } diff --git a/src/librbd/trash_watcher/Types.cc b/src/librbd/trash_watcher/Types.cc index 3063a666ff48..f3e338140ce9 100644 --- a/src/librbd/trash_watcher/Types.cc +++ b/src/librbd/trash_watcher/Types.cc @@ -35,7 +35,7 @@ void ImageAddedPayload::encode(bufferlist &bl) const { encode(trash_image_spec, bl); } -void ImageAddedPayload::decode(__u8 version, bufferlist::iterator &iter) { +void ImageAddedPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(image_id, iter); decode(trash_image_spec, iter); @@ -53,7 +53,7 @@ void ImageRemovedPayload::encode(bufferlist &bl) const { encode(image_id, bl); } -void ImageRemovedPayload::decode(__u8 version, bufferlist::iterator &iter) { +void ImageRemovedPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(image_id, iter); } @@ -66,7 +66,7 @@ void UnknownPayload::encode(bufferlist &bl) const { ceph_abort(); } -void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) { +void UnknownPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void UnknownPayload::dump(Formatter *f) const { @@ -78,7 +78,7 @@ void NotifyMessage::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void NotifyMessage::decode(bufferlist::iterator& iter) { +void NotifyMessage::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; diff --git a/src/librbd/trash_watcher/Types.h b/src/librbd/trash_watcher/Types.h index 3f0040cd69d6..22c2b4375dca 100644 --- a/src/librbd/trash_watcher/Types.h +++ b/src/librbd/trash_watcher/Types.h @@ -36,7 +36,7 @@ struct ImageAddedPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -52,7 +52,7 @@ struct ImageRemovedPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -63,7 +63,7 @@ struct UnknownPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -78,7 +78,7 @@ struct NotifyMessage { Payload payload; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/librbd/watcher/Notifier.cc b/src/librbd/watcher/Notifier.cc index fb0f07fdfa70..80ed25abace5 100644 --- a/src/librbd/watcher/Notifier.cc +++ b/src/librbd/watcher/Notifier.cc @@ -26,7 +26,7 @@ void Notifier::C_AioNotify::finish(int r) { if (response != nullptr) { if (r == 0 || r == -ETIMEDOUT) { try { - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); decode(*response, it); } catch (const buffer::error &err) { r = -EBADMSG; diff --git a/src/librbd/watcher/Types.cc b/src/librbd/watcher/Types.cc index 8fca7e20dfd1..8f1991d7bf9f 100644 --- a/src/librbd/watcher/Types.cc +++ b/src/librbd/watcher/Types.cc @@ -13,7 +13,7 @@ void ClientId::encode(bufferlist &bl) const { encode(handle, bl); } -void ClientId::decode(bufferlist::iterator &iter) { +void ClientId::decode(bufferlist::const_iterator &iter) { using ceph::decode; decode(gid, iter); decode(handle, iter); @@ -30,7 +30,7 @@ void NotifyResponse::encode(bufferlist& bl) const { encode(timeouts, bl); } -void NotifyResponse::decode(bufferlist::iterator& iter) { +void NotifyResponse::decode(bufferlist::const_iterator& iter) { using ceph::decode; decode(acks, iter); decode(timeouts, iter); diff --git a/src/librbd/watcher/Types.h b/src/librbd/watcher/Types.h index 1b2c90bb56ab..d1517fb0f5d8 100644 --- a/src/librbd/watcher/Types.h +++ b/src/librbd/watcher/Types.h @@ -24,7 +24,7 @@ struct ClientId { ClientId(uint64_t gid, uint64_t handle) : gid(gid), handle(handle) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; inline bool is_valid() const { @@ -51,7 +51,7 @@ struct NotifyResponse { std::vector timeouts; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); }; template diff --git a/src/librbd/watcher/Utils.h b/src/librbd/watcher/Utils.h index 92a16e6b65e7..d2510aaf36ca 100644 --- a/src/librbd/watcher/Utils.h +++ b/src/librbd/watcher/Utils.h @@ -54,7 +54,7 @@ private: class DecodePayloadVisitor : public boost::static_visitor { public: - DecodePayloadVisitor(__u8 version, bufferlist::iterator &iter) + DecodePayloadVisitor(__u8 version, bufferlist::const_iterator &iter) : m_version(version), m_iter(iter) {} template @@ -64,7 +64,7 @@ public: private: __u8 m_version; - bufferlist::iterator &m_iter; + bufferlist::const_iterator &m_iter; }; } // namespace util diff --git a/src/rbd_replay/ActionTypes.cc b/src/rbd_replay/ActionTypes.cc index 167bf8522331..2b203701f9ac 100644 --- a/src/rbd_replay/ActionTypes.cc +++ b/src/rbd_replay/ActionTypes.cc @@ -22,7 +22,7 @@ bool byte_swap_required(__u8 version) { #endif } -void decode_big_endian_string(std::string &str, bufferlist::iterator &it) { +void decode_big_endian_string(std::string &str, bufferlist::const_iterator &it) { using ceph::decode; #if defined(CEPH_LITTLE_ENDIAN) uint32_t length; @@ -52,7 +52,7 @@ private: class DecodeVisitor : public boost::static_visitor { public: - DecodeVisitor(__u8 version, bufferlist::iterator &iter) + DecodeVisitor(__u8 version, bufferlist::const_iterator &iter) : m_version(version), m_iter(iter) { } @@ -62,7 +62,7 @@ public: } private: __u8 m_version; - bufferlist::iterator &m_iter; + bufferlist::const_iterator &m_iter; }; class DumpVisitor : public boost::static_visitor { @@ -87,11 +87,11 @@ void Dependency::encode(bufferlist &bl) const { encode(time_delta, bl); } -void Dependency::decode(bufferlist::iterator &it) { +void Dependency::decode(bufferlist::const_iterator &it) { decode(1, it); } -void Dependency::decode(__u8 version, bufferlist::iterator &it) { +void Dependency::decode(__u8 version, bufferlist::const_iterator &it) { using ceph::decode; decode(id, it); decode(time_delta, it); @@ -118,7 +118,7 @@ void ActionBase::encode(bufferlist &bl) const { encode(dependencies, bl); } -void ActionBase::decode(__u8 version, bufferlist::iterator &it) { +void ActionBase::decode(__u8 version, bufferlist::const_iterator &it) { using ceph::decode; decode(id, it); decode(thread_id, it); @@ -164,7 +164,7 @@ void ImageActionBase::encode(bufferlist &bl) const { encode(imagectx_id, bl); } -void ImageActionBase::decode(__u8 version, bufferlist::iterator &it) { +void ImageActionBase::decode(__u8 version, bufferlist::const_iterator &it) { using ceph::decode; ActionBase::decode(version, it); decode(imagectx_id, it); @@ -185,7 +185,7 @@ void IoActionBase::encode(bufferlist &bl) const { encode(length, bl); } -void IoActionBase::decode(__u8 version, bufferlist::iterator &it) { +void IoActionBase::decode(__u8 version, bufferlist::const_iterator &it) { using ceph::decode; ImageActionBase::decode(version, it); decode(offset, it); @@ -210,7 +210,7 @@ void OpenImageAction::encode(bufferlist &bl) const { encode(read_only, bl); } -void OpenImageAction::decode(__u8 version, bufferlist::iterator &it) { +void OpenImageAction::decode(__u8 version, bufferlist::const_iterator &it) { using ceph::decode; ImageActionBase::decode(version, it); if (byte_swap_required(version)) { @@ -238,7 +238,7 @@ void AioOpenImageAction::encode(bufferlist &bl) const { encode(read_only, bl); } -void AioOpenImageAction::decode(__u8 version, bufferlist::iterator &it) { +void AioOpenImageAction::decode(__u8 version, bufferlist::const_iterator &it) { using ceph::decode; ImageActionBase::decode(version, it); if (byte_swap_required(version)) { @@ -262,7 +262,7 @@ void UnknownAction::encode(bufferlist &bl) const { ceph_abort(); } -void UnknownAction::decode(__u8 version, bufferlist::iterator &it) { +void UnknownAction::decode(__u8 version, bufferlist::const_iterator &it) { } void UnknownAction::dump(Formatter *f) const { @@ -274,17 +274,17 @@ void ActionEntry::encode(bufferlist &bl) const { ENCODE_FINISH(bl); } -void ActionEntry::decode(bufferlist::iterator &it) { +void ActionEntry::decode(bufferlist::const_iterator &it) { DECODE_START(1, it); decode(struct_v, it); DECODE_FINISH(it); } -void ActionEntry::decode_unversioned(bufferlist::iterator &it) { +void ActionEntry::decode_unversioned(bufferlist::const_iterator &it) { decode(0, it); } -void ActionEntry::decode(__u8 version, bufferlist::iterator &it) { +void ActionEntry::decode(__u8 version, bufferlist::const_iterator &it) { using ceph::decode; uint8_t action_type; decode(action_type, it); diff --git a/src/rbd_replay/ActionTypes.h b/src/rbd_replay/ActionTypes.h index c7c86e751ea2..880b2040201c 100644 --- a/src/rbd_replay/ActionTypes.h +++ b/src/rbd_replay/ActionTypes.h @@ -50,8 +50,8 @@ struct Dependency { } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); - void decode(__u8 version, bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -89,7 +89,7 @@ struct ActionBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); void dump(Formatter *f) const; }; @@ -126,7 +126,7 @@ struct ImageActionBase : public ActionBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); void dump(Formatter *f) const; }; @@ -144,7 +144,7 @@ struct IoActionBase : public ImageActionBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); void dump(Formatter *f) const; }; @@ -238,7 +238,7 @@ struct OpenImageAction : public ImageActionBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); void dump(Formatter *f) const; }; @@ -271,7 +271,7 @@ struct AioOpenImageAction : public ImageActionBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); void dump(Formatter *f) const; }; @@ -290,7 +290,7 @@ struct UnknownAction { static const ActionType ACTION_TYPE = static_cast(-1); void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); void dump(Formatter *f) const; }; @@ -318,14 +318,14 @@ public: } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &it); - void decode_unversioned(bufferlist::iterator &it); + void decode(bufferlist::const_iterator &it); + void decode_unversioned(bufferlist::const_iterator &it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); private: - void decode(__u8 version, bufferlist::iterator &it); + void decode(__u8 version, bufferlist::const_iterator &it); }; WRITE_CLASS_ENCODER(ActionEntry); diff --git a/src/rbd_replay/BufferReader.cc b/src/rbd_replay/BufferReader.cc index 631c17e7a9e7..1c84c117ebc1 100644 --- a/src/rbd_replay/BufferReader.cc +++ b/src/rbd_replay/BufferReader.cc @@ -13,7 +13,7 @@ BufferReader::BufferReader(int fd, size_t min_bytes, size_t max_bytes) assert(m_min_bytes <= m_max_bytes); } -int BufferReader::fetch(bufferlist::iterator **it) { +int BufferReader::fetch(bufferlist::const_iterator **it) { if (m_bl_it.get_remaining() < m_min_bytes) { ssize_t bytes_to_read = round_up_to(m_max_bytes - m_bl_it.get_remaining(), CEPH_PAGE_SIZE); diff --git a/src/rbd_replay/BufferReader.h b/src/rbd_replay/BufferReader.h index 07f7b09ccaaa..38a10577401d 100644 --- a/src/rbd_replay/BufferReader.h +++ b/src/rbd_replay/BufferReader.h @@ -17,14 +17,14 @@ public: BufferReader(int fd, size_t min_bytes = DEFAULT_MIN_BYTES, size_t max_bytes = DEFAULT_MAX_BYTES); - int fetch(bufferlist::iterator **it); + int fetch(bufferlist::const_iterator **it); private: int m_fd; size_t m_min_bytes; size_t m_max_bytes; bufferlist m_bl; - bufferlist::iterator m_bl_it; + bufferlist::const_iterator m_bl_it; bool m_eof_reached; }; diff --git a/src/rbd_replay/Replayer.cc b/src/rbd_replay/Replayer.cc index 9d2468cdd67b..9fca229fe795 100644 --- a/src/rbd_replay/Replayer.cc +++ b/src/rbd_replay/Replayer.cc @@ -32,7 +32,7 @@ using namespace rbd_replay; namespace { bool is_versioned_replay(BufferReader &buffer_reader) { - bufferlist::iterator *it; + bufferlist::const_iterator *it; int r = buffer_reader.fetch(&it); if (r < 0) { return false; @@ -227,7 +227,7 @@ void Replayer::run(const std::string& replay_file) { while (true) { action::ActionEntry action_entry; try { - bufferlist::iterator *it; + bufferlist::const_iterator *it; int r = buffer_reader.fetch(&it); if (r < 0) { std::cerr << "Failed to read from trace file: " << cpp_strerror(r) diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index 201053b8133c..86a1910317e0 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -2131,7 +2131,7 @@ TEST_F(TestClsRbd, group_image_clean) { ASSERT_EQ(0, ioctx.omap_get_vals(group_id, "", 10, &vals)); cls::rbd::GroupImageLinkState ref_state; - bufferlist::iterator it = vals[image_key].begin(); + auto it = vals[image_key].cbegin(); decode(ref_state, it); ASSERT_EQ(cls::rbd::GROUP_IMAGE_LINK_STATE_ATTACHED, ref_state); } @@ -2155,7 +2155,7 @@ TEST_F(TestClsRbd, image_group_add) { ASSERT_EQ(0, ioctx.omap_get_vals(image_id, "", RBD_GROUP_REF, 10, &vals)); cls::rbd::GroupSpec val_spec; - bufferlist::iterator it = vals[RBD_GROUP_REF].begin(); + auto it = vals[RBD_GROUP_REF].cbegin(); decode(val_spec, it); ASSERT_EQ(group_id, val_spec.group_id); diff --git a/src/test/librbd/journal/test_Entries.cc b/src/test/librbd/journal/test_Entries.cc index 936aad44dd0f..575ddd587c3a 100644 --- a/src/test/librbd/journal/test_Entries.cc +++ b/src/test/librbd/journal/test_Entries.cc @@ -106,7 +106,7 @@ public: librbd::journal::EventEntry *event_entry) { try { bufferlist data_bl = replay_entry.get_data(); - bufferlist::iterator it = data_bl.begin(); + auto it = data_bl.cbegin(); decode(*event_entry, it); } catch (const buffer::error &err) { return false; diff --git a/src/test/librbd/journal/test_mock_Replay.cc b/src/test/librbd/journal/test_mock_Replay.cc index 1c9a9c0875e6..95bd5c50ac83 100644 --- a/src/test/librbd/journal/test_mock_Replay.cc +++ b/src/test/librbd/journal/test_mock_Replay.cc @@ -299,12 +299,12 @@ public: bufferlist bl; encode(event_entry, bl); - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); when_process(mock_journal_replay, &it, on_ready, on_safe); } void when_process(MockJournalReplay &mock_journal_replay, - bufferlist::iterator *it, Context *on_ready, + bufferlist::const_iterator *it, Context *on_ready, Context *on_safe) { EventEntry event_entry; int r = mock_journal_replay.decode(it, &event_entry); @@ -1820,7 +1820,7 @@ TEST_F(TestMockJournalReplay, UnknownEvent) { encode(static_cast(-1), bl); ENCODE_FINISH(bl); - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); C_SaferCond on_ready; C_SaferCond on_safe; when_process(mock_journal_replay, &it, &on_ready, &on_safe); diff --git a/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc b/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc index bb83a1de7117..b270ba4ab9d4 100644 --- a/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc +++ b/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc @@ -88,7 +88,7 @@ MATCHER_P(IsLockType, exclusive, "") { cls_lock_lock_op op; bufferlist bl; bl.share(arg); - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(op, iter); return op.type == (exclusive ? LOCK_EXCLUSIVE : LOCK_SHARED); } diff --git a/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc b/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc index abb4a977057e..993be5aabdcc 100644 --- a/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc +++ b/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc @@ -22,7 +22,7 @@ MATCHER_P(IsLockType, exclusive, "") { cls_lock_set_cookie_op op; bufferlist bl; bl.share(arg); - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(op, iter); return op.type == (exclusive ? LOCK_EXCLUSIVE : LOCK_SHARED); } diff --git a/src/test/librbd/test_ImageWatcher.cc b/src/test/librbd/test_ImageWatcher.cc index 9b85d5d6ef2b..9def43e28e97 100644 --- a/src/test/librbd/test_ImageWatcher.cc +++ b/src/test/librbd/test_ImageWatcher.cc @@ -65,7 +65,7 @@ public: try { int op; bufferlist payload; - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); DECODE_START(1, iter); decode(op, iter); iter.copy_all(payload); @@ -156,8 +156,8 @@ public: } bufferlist payload = m_notify_payloads[op]; - bufferlist::iterator iter = payload.begin(); - + auto iter = payload.cbegin(); + switch (op) { case NOTIFY_OP_FLATTEN: { diff --git a/src/test/librbd/test_mock_Journal.cc b/src/test/librbd/test_mock_Journal.cc index 1f5cd749eac0..bac9be185d5d 100644 --- a/src/test/librbd/test_mock_Journal.cc +++ b/src/test/librbd/test_mock_Journal.cc @@ -64,7 +64,7 @@ struct MockReplay { } MOCK_METHOD2(shut_down, void(bool cancel_ops, Context *)); - MOCK_METHOD2(decode, int(bufferlist::iterator*, EventEntry *)); + MOCK_METHOD2(decode, int(bufferlist::const_iterator*, EventEntry *)); MOCK_METHOD3(process, void(const EventEntry&, Context *, Context *)); MOCK_METHOD2(replay_op_ready, void(uint64_t, Context *)); }; @@ -80,7 +80,7 @@ public: MockReplay::get_instance().shut_down(cancel_ops, on_finish); } - int decode(bufferlist::iterator *it, EventEntry *event_entry) { + int decode(bufferlist::const_iterator *it, EventEntry *event_entry) { return MockReplay::get_instance().decode(it, event_entry); } diff --git a/src/test/librbd/trash/test_mock_MoveRequest.cc b/src/test/librbd/trash/test_mock_MoveRequest.cc index e315efac3864..0165b3373ed9 100644 --- a/src/test/librbd/trash/test_mock_MoveRequest.cc +++ b/src/test/librbd/trash/test_mock_MoveRequest.cc @@ -67,7 +67,7 @@ struct TestMockTrashMoveRequest : public TestMockFixture { std::string id; cls::rbd::TrashImageSpec trash_image_spec; - bufferlist::iterator bl_it = in_bl.begin(); + auto bl_it = in_bl.cbegin(); decode(id, bl_it); decode(trash_image_spec, bl_it); diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc index 334156721c2c..afa71c4ff78b 100644 --- a/src/tools/rbd/Utils.cc +++ b/src/tools/rbd/Utils.cc @@ -67,7 +67,7 @@ int read_string(int fd, unsigned max, std::string *out) { bufferlist bl; bl.append(buf, 4); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); uint32_t len; decode(len, p); if (len > max) diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc index a90913b4e897..e116cc0e88da 100644 --- a/src/tools/rbd/action/Import.cc +++ b/src/tools/rbd/action/Import.cc @@ -219,7 +219,7 @@ static int do_image_resize(ImportDiffContext *idiffctx) bufferlist bl; bl.append(buf, sizeof(buf)); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(end_size, p); uint64_t cur_size; @@ -245,7 +245,7 @@ static int do_image_io(ImportDiffContext *idiffctx, bool discard, size_t sparse_ bufferlist bl; bl.append(buf, sizeof(buf)); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); uint64_t image_offset, buffer_length; decode(image_offset, p); @@ -363,7 +363,7 @@ static int read_tag(int fd, __u8 end_tag, int format, __u8 *tag, uint64_t *readl bufferlist bl; bl.append(buf, sizeof(buf)); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(*readlen, p); } @@ -585,8 +585,7 @@ static int decode_and_set_image_option(int fd, uint64_t imageopt, librbd::ImageO bufferlist bl; bl.append(buf, sizeof(buf)); - bufferlist::iterator it; - it = bl.begin(); + auto it = bl.cbegin(); uint64_t val; decode(val, it); @@ -710,7 +709,7 @@ static int do_import_v2(librados::Rados &rados, int fd, librbd::Image &image, } bufferlist bl; bl.append(buf, sizeof(buf)); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); uint64_t diff_num; decode(diff_num, p); for (size_t i = 0; i < diff_num; i++) { diff --git a/src/tools/rbd/action/Journal.cc b/src/tools/rbd/action/Journal.cc index 7f155a87c2e0..64883f5500b4 100644 --- a/src/tools/rbd/action/Journal.cc +++ b/src/tools/rbd/action/Journal.cc @@ -363,7 +363,7 @@ static int inspect_entry(bufferlist& data, librbd::journal::EventEntry& event_entry, bool verbose) { try { - bufferlist::iterator it = data.begin(); + auto it = data.cbegin(); decode(event_entry, it); } catch (const buffer::error &err) { std::cerr << "failed to decode event entry: " << err.what() << std::endl; diff --git a/src/tools/rbd/action/MergeDiff.cc b/src/tools/rbd/action/MergeDiff.cc index d9e2d9cbf082..a996af767e60 100644 --- a/src/tools/rbd/action/MergeDiff.cc +++ b/src/tools/rbd/action/MergeDiff.cc @@ -66,7 +66,7 @@ static int parse_diff_header(int fd, __u8 *tag, string *from, string *to, uint64 bufferlist bl; bl.append(buf, 8); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(*size, p); } else { break; @@ -102,7 +102,7 @@ static int parse_diff_body(int fd, __u8 *tag, uint64_t *offset, uint64_t *length bufferlist bl; bl.append(buf, 16); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(*offset, p); decode(*length, p); diff --git a/src/tools/rbd/action/Watch.cc b/src/tools/rbd/action/Watch.cc index 1e612512b5e2..6957dae41517 100644 --- a/src/tools/rbd/action/Watch.cc +++ b/src/tools/rbd/action/Watch.cc @@ -37,7 +37,7 @@ public: notify_message = NotifyMessage(HeaderUpdatePayload()); } else { try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); notify_message.decode(iter); } catch (const buffer::error &err) { std::cerr << "rbd: failed to decode image notification" << std::endl; diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 3af0e3a0d5c5..275ddabe8bac 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -1038,7 +1038,7 @@ void ImageReplayer::handle_get_remote_tag(int r) { if (r == 0) { try { - bufferlist::iterator it = m_replay_tag.data.begin(); + auto it = m_replay_tag.data.cbegin(); decode(m_replay_tag_data, it); } catch (const buffer::error &err) { r = -EBADMSG; @@ -1124,7 +1124,7 @@ void ImageReplayer::preprocess_entry() { << dendl; bufferlist data = m_replay_entry.get_data(); - bufferlist::iterator it = data.begin(); + auto it = data.cbegin(); int r = m_local_replay->decode(&it, &m_event_entry); if (r < 0) { derr << "failed to decode journal event" << dendl; diff --git a/src/tools/rbd_mirror/InstanceWatcher.cc b/src/tools/rbd_mirror/InstanceWatcher.cc index e69890aaddf5..cd317d73afe2 100644 --- a/src/tools/rbd_mirror/InstanceWatcher.cc +++ b/src/tools/rbd_mirror/InstanceWatcher.cc @@ -42,7 +42,7 @@ struct C_GetInstances : public Context { << dendl; if (r == 0) { - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); r = librbd::cls_client::mirror_instances_list_finish(&it, instance_ids); } else if (r == -ENOENT) { r = 0; @@ -183,7 +183,7 @@ struct InstanceWatcher::C_NotifyInstanceRequest : public Context { continue; } try { - auto iter = bl.begin(); + auto iter = bl.cbegin(); NotifyAckPayload ack; decode(ack, iter); if (ack.instance_id != instance_watcher->get_instance_id()) { @@ -1106,7 +1106,7 @@ void InstanceWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(notify_message, iter); } catch (const buffer::error &err) { derr << "error decoding image notification: " << err.what() << dendl; diff --git a/src/tools/rbd_mirror/LeaderWatcher.cc b/src/tools/rbd_mirror/LeaderWatcher.cc index f9edf021b774..13fb62076691 100644 --- a/src/tools/rbd_mirror/LeaderWatcher.cc +++ b/src/tools/rbd_mirror/LeaderWatcher.cc @@ -1077,7 +1077,7 @@ void LeaderWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(notify_message, iter); } catch (const buffer::error &err) { derr << ": error decoding image notification: " << err.what() << dendl; diff --git a/src/tools/rbd_mirror/PoolWatcher.cc b/src/tools/rbd_mirror/PoolWatcher.cc index 9056a615ddd6..e619ea61cac5 100644 --- a/src/tools/rbd_mirror/PoolWatcher.cc +++ b/src/tools/rbd_mirror/PoolWatcher.cc @@ -304,7 +304,7 @@ void PoolWatcher::handle_get_mirror_uuid(int r) { m_pending_mirror_uuid = ""; if (r >= 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = librbd::cls_client::mirror_uuid_get_finish( &it, &m_pending_mirror_uuid); } diff --git a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc index 772333f9f961..c2bc347199d2 100644 --- a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc +++ b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc @@ -56,7 +56,7 @@ void RemoveRequest::handle_get_snap_context(int r) { ::SnapContext snapc; if (r == 0) { - auto bl_it = m_out_bl.begin(); + auto bl_it = m_out_bl.cbegin(); r = librbd::cls_client::get_snapcontext_finish(&bl_it, &snapc); } if (r < 0 && r != -ENOENT) { diff --git a/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc b/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc index bf52853277a9..f7939480a2b5 100644 --- a/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc +++ b/src/tools/rbd_mirror/image_deleter/TrashMoveRequest.cc @@ -54,7 +54,7 @@ void TrashMoveRequest::handle_get_mirror_image_id(int r) { dout(10) << "r=" << r << dendl; if (r == 0) { - auto bl_it = m_out_bl.begin(); + auto bl_it = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_get_image_id_finish(&bl_it, &m_image_id); } diff --git a/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc b/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc index 05b90ad59fe6..0bba32509823 100644 --- a/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc +++ b/src/tools/rbd_mirror/image_deleter/TrashWatcher.cc @@ -257,7 +257,7 @@ void TrashWatcher::handle_trash_list(int r) { std::map images; if (r >= 0) { - auto bl_it = m_out_bl.begin(); + auto bl_it = m_out_bl.cbegin(); r = librbd::cls_client::trash_list_finish(&bl_it, &images); } diff --git a/src/tools/rbd_mirror/image_map/LoadRequest.cc b/src/tools/rbd_mirror/image_map/LoadRequest.cc index 2139a02d9e3e..18b2f615713e 100644 --- a/src/tools/rbd_mirror/image_map/LoadRequest.cc +++ b/src/tools/rbd_mirror/image_map/LoadRequest.cc @@ -62,7 +62,7 @@ void LoadRequest::handle_image_map_list(int r) { std::map image_mapping; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_map_list_finish(&it, &image_mapping); } diff --git a/src/tools/rbd_mirror/image_map/Types.cc b/src/tools/rbd_mirror/image_map/Types.cc index e9041a5b805d..6fdbad007214 100644 --- a/src/tools/rbd_mirror/image_map/Types.cc +++ b/src/tools/rbd_mirror/image_map/Types.cc @@ -41,7 +41,7 @@ private: class DecodeVisitor : public boost::static_visitor { public: - DecodeVisitor(__u8 version, bufferlist::iterator &iter) + DecodeVisitor(__u8 version, bufferlist::const_iterator &iter) : m_version(version), m_iter(iter) { } @@ -51,7 +51,7 @@ public: } private: __u8 m_version; - bufferlist::iterator &m_iter; + bufferlist::const_iterator &m_iter; }; class DumpVisitor : public boost::static_visitor { @@ -82,7 +82,7 @@ void PolicyData::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void PolicyData::decode(bufferlist::iterator& it) { +void PolicyData::decode(bufferlist::const_iterator& it) { DECODE_START(1, it); uint32_t policy_meta_type; diff --git a/src/tools/rbd_mirror/image_map/Types.h b/src/tools/rbd_mirror/image_map/Types.h index bc23622e8efb..3ccfb940d15a 100644 --- a/src/tools/rbd_mirror/image_map/Types.h +++ b/src/tools/rbd_mirror/image_map/Types.h @@ -73,7 +73,7 @@ struct PolicyMetaNone { void encode(bufferlist& bl) const { } - void decode(__u8 version, bufferlist::iterator& it) { + void decode(__u8 version, bufferlist::const_iterator& it) { } void dump(Formatter *f) const { @@ -90,7 +90,7 @@ struct PolicyMetaUnknown { assert(false); } - void decode(__u8 version, bufferlist::iterator& it) { + void decode(__u8 version, bufferlist::const_iterator& it) { } void dump(Formatter *f) const { @@ -113,7 +113,7 @@ struct PolicyData { PolicyMetaType get_policy_meta_type() const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc index 8417a005bf7d..fde07e804449 100644 --- a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc @@ -123,7 +123,7 @@ void BootstrapRequest::handle_get_remote_tag_class(int r) { } librbd::journal::ClientData client_data; - bufferlist::iterator it = m_client.data.begin(); + auto it = m_client.data.cbegin(); try { decode(client_data, it); } catch (const buffer::error &err) { @@ -566,7 +566,7 @@ void BootstrapRequest::handle_get_remote_tags(int r) { } try { - bufferlist::iterator it = remote_tag.data.begin(); + auto it = remote_tag.data.cbegin(); decode(remote_tag_data, it); remote_tag_data_valid = true; } catch (const buffer::error &err) { diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc index 351bf1e50ce6..50af8e4e9a16 100644 --- a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc @@ -140,7 +140,7 @@ void CreateImageRequest::handle_get_parent_global_image_id(int r) { dout(20) << ": r=" << r << dendl; if (r == 0) { cls::rbd::MirrorImage mirror_image; - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_get_finish(&iter, &mirror_image); if (r == 0) { m_parent_global_image_id = mirror_image.global_image_id; @@ -187,7 +187,7 @@ void CreateImageRequest::handle_get_local_parent_image_id(int r) { dout(20) << ": r=" << r << dendl; if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_get_image_id_finish( &iter, &m_local_parent_spec.image_id); } diff --git a/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc b/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc index 1a7b4bca33c2..a224862a82ee 100644 --- a/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc @@ -48,7 +48,7 @@ void GetMirrorImageIdRequest::get_image_id() { template void GetMirrorImageIdRequest::handle_get_image_id(int r) { if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_get_image_id_finish( &iter, m_image_id); } diff --git a/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc b/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc index e728e2461717..b83c07148ccc 100644 --- a/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc @@ -56,7 +56,7 @@ void IsPrimaryRequest::handle_get_mirror_state(int r) { cls::rbd::MirrorImage mirror_image; if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_get_finish(&iter, &mirror_image); if (r == 0) { if (mirror_image.state == cls::rbd::MIRROR_IMAGE_STATE_ENABLED) { diff --git a/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc index b65ccb1aa0c0..3462dc8354ad 100644 --- a/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc @@ -79,7 +79,7 @@ void PrepareLocalImageRequest::handle_get_local_image_name(int r) { dout(20) << "r=" << r << dendl; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = librbd::cls_client::dir_get_name_finish(&it, m_local_image_name); } @@ -116,7 +116,7 @@ void PrepareLocalImageRequest::handle_get_mirror_state(int r) { cls::rbd::MirrorImage mirror_image; if (r == 0) { - bufferlist::iterator iter = m_out_bl.begin(); + auto iter = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_get_finish(&iter, &mirror_image); } diff --git a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc index 55a7942fbaeb..ceb2c8e34a7a 100644 --- a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc @@ -53,7 +53,7 @@ void PrepareRemoteImageRequest::get_remote_mirror_uuid() { template void PrepareRemoteImageRequest::handle_get_remote_mirror_uuid(int r) { if (r >= 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = librbd::cls_client::mirror_uuid_get_finish(&it, m_remote_mirror_uuid); if (r >= 0 && m_remote_mirror_uuid->empty()) { r = -ENOENT; @@ -186,7 +186,7 @@ bool PrepareRemoteImageRequest::decode_client_meta() { dout(20) << dendl; librbd::journal::ClientData client_data; - bufferlist::iterator it = m_client.data.begin(); + auto it = m_client.data.cbegin(); try { decode(client_data, it); } catch (const buffer::error &err) { diff --git a/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc b/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc index 3174a32d1dc2..42c9be929ffd 100644 --- a/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc +++ b/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc @@ -189,7 +189,7 @@ void ReplayStatusFormatter::handle_update_tag_cache(uint64_t master_tag_tid, } else { dout(20) << "retrieved tag " << master_tag_tid << ": " << m_tag << dendl; - bufferlist::iterator it = m_tag.data.begin(); + auto it = m_tag.data.cbegin(); try { decode(tag_data, it); } catch (const buffer::error &err) { diff --git a/src/tools/rbd_mirror/instance_watcher/Types.cc b/src/tools/rbd_mirror/instance_watcher/Types.cc index b56ed38918e6..8dbf91220c71 100644 --- a/src/tools/rbd_mirror/instance_watcher/Types.cc +++ b/src/tools/rbd_mirror/instance_watcher/Types.cc @@ -29,7 +29,7 @@ private: class DecodePayloadVisitor : public boost::static_visitor { public: - DecodePayloadVisitor(__u8 version, bufferlist::iterator &iter) + DecodePayloadVisitor(__u8 version, bufferlist::const_iterator &iter) : m_version(version), m_iter(iter) {} template @@ -39,7 +39,7 @@ public: private: __u8 m_version; - bufferlist::iterator &m_iter; + bufferlist::const_iterator &m_iter; }; class DumpPayloadVisitor : public boost::static_visitor { @@ -64,7 +64,7 @@ void PayloadBase::encode(bufferlist &bl) const { encode(request_id, bl); } -void PayloadBase::decode(__u8 version, bufferlist::iterator &iter) { +void PayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; decode(request_id, iter); } @@ -79,7 +79,7 @@ void ImagePayloadBase::encode(bufferlist &bl) const { encode(global_image_id, bl); } -void ImagePayloadBase::decode(__u8 version, bufferlist::iterator &iter) { +void ImagePayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; PayloadBase::decode(version, iter); decode(global_image_id, iter); @@ -97,7 +97,7 @@ void PeerImageRemovedPayload::encode(bufferlist &bl) const { encode(peer_mirror_uuid, bl); } -void PeerImageRemovedPayload::decode(__u8 version, bufferlist::iterator &iter) { +void PeerImageRemovedPayload::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; PayloadBase::decode(version, iter); decode(global_image_id, iter); @@ -116,7 +116,7 @@ void SyncPayloadBase::encode(bufferlist &bl) const { encode(sync_id, bl); } -void SyncPayloadBase::decode(__u8 version, bufferlist::iterator &iter) { +void SyncPayloadBase::decode(__u8 version, bufferlist::const_iterator &iter) { using ceph::decode; PayloadBase::decode(version, iter); decode(sync_id, iter); @@ -131,7 +131,7 @@ void UnknownPayload::encode(bufferlist &bl) const { ceph_abort(); } -void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) { +void UnknownPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void UnknownPayload::dump(Formatter *f) const { @@ -143,7 +143,7 @@ void NotifyMessage::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void NotifyMessage::decode(bufferlist::iterator& iter) { +void NotifyMessage::decode(bufferlist::const_iterator& iter) { DECODE_START(2, iter); uint32_t notify_op; @@ -227,7 +227,7 @@ void NotifyAckPayload::encode(bufferlist &bl) const { encode(ret_val, bl); } -void NotifyAckPayload::decode(bufferlist::iterator &iter) { +void NotifyAckPayload::decode(bufferlist::const_iterator &iter) { using ceph::decode; decode(instance_id, iter); decode(request_id, iter); diff --git a/src/tools/rbd_mirror/instance_watcher/Types.h b/src/tools/rbd_mirror/instance_watcher/Types.h index 70af2f79112b..b0b7b77910eb 100644 --- a/src/tools/rbd_mirror/instance_watcher/Types.h +++ b/src/tools/rbd_mirror/instance_watcher/Types.h @@ -36,7 +36,7 @@ struct PayloadBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -51,7 +51,7 @@ struct ImagePayloadBase : public PayloadBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -91,7 +91,7 @@ struct PeerImageRemovedPayload : public PayloadBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -106,7 +106,7 @@ struct SyncPayloadBase : public PayloadBase { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -139,7 +139,7 @@ struct UnknownPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -157,7 +157,7 @@ struct NotifyMessage { Payload payload; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -181,7 +181,7 @@ struct NotifyAckPayload { } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; }; diff --git a/src/tools/rbd_mirror/leader_watcher/Types.cc b/src/tools/rbd_mirror/leader_watcher/Types.cc index 0cd86ebad67c..a767db8d7a70 100644 --- a/src/tools/rbd_mirror/leader_watcher/Types.cc +++ b/src/tools/rbd_mirror/leader_watcher/Types.cc @@ -29,7 +29,7 @@ private: class DecodePayloadVisitor : public boost::static_visitor { public: - DecodePayloadVisitor(__u8 version, bufferlist::iterator &iter) + DecodePayloadVisitor(__u8 version, bufferlist::const_iterator &iter) : m_version(version), m_iter(iter) {} template @@ -39,7 +39,7 @@ public: private: __u8 m_version; - bufferlist::iterator &m_iter; + bufferlist::const_iterator &m_iter; }; class DumpPayloadVisitor : public boost::static_visitor { @@ -62,7 +62,7 @@ private: void HeartbeatPayload::encode(bufferlist &bl) const { } -void HeartbeatPayload::decode(__u8 version, bufferlist::iterator &iter) { +void HeartbeatPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void HeartbeatPayload::dump(Formatter *f) const { @@ -71,7 +71,7 @@ void HeartbeatPayload::dump(Formatter *f) const { void LockAcquiredPayload::encode(bufferlist &bl) const { } -void LockAcquiredPayload::decode(__u8 version, bufferlist::iterator &iter) { +void LockAcquiredPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void LockAcquiredPayload::dump(Formatter *f) const { @@ -80,7 +80,7 @@ void LockAcquiredPayload::dump(Formatter *f) const { void LockReleasedPayload::encode(bufferlist &bl) const { } -void LockReleasedPayload::decode(__u8 version, bufferlist::iterator &iter) { +void LockReleasedPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void LockReleasedPayload::dump(Formatter *f) const { @@ -90,7 +90,7 @@ void UnknownPayload::encode(bufferlist &bl) const { ceph_abort(); } -void UnknownPayload::decode(__u8 version, bufferlist::iterator &iter) { +void UnknownPayload::decode(__u8 version, bufferlist::const_iterator &iter) { } void UnknownPayload::dump(Formatter *f) const { @@ -102,7 +102,7 @@ void NotifyMessage::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void NotifyMessage::decode(bufferlist::iterator& iter) { +void NotifyMessage::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; diff --git a/src/tools/rbd_mirror/leader_watcher/Types.h b/src/tools/rbd_mirror/leader_watcher/Types.h index 6d5e5b3613de..1278e54b77cd 100644 --- a/src/tools/rbd_mirror/leader_watcher/Types.h +++ b/src/tools/rbd_mirror/leader_watcher/Types.h @@ -48,7 +48,7 @@ struct HeartbeatPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -59,7 +59,7 @@ struct LockAcquiredPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -70,7 +70,7 @@ struct LockReleasedPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -81,7 +81,7 @@ struct UnknownPayload { } void encode(bufferlist &bl) const; - void decode(__u8 version, bufferlist::iterator &iter); + void decode(__u8 version, bufferlist::const_iterator &iter); void dump(Formatter *f) const; }; @@ -97,7 +97,7 @@ struct NotifyMessage { Payload payload; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.cc b/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.cc index 3b216cc33d81..fe919711c683 100644 --- a/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.cc +++ b/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.cc @@ -49,7 +49,7 @@ void RefreshImagesRequest::handle_mirror_image_list(int r) { std::map ids; if (r == 0) { - bufferlist::iterator it = m_out_bl.begin(); + auto it = m_out_bl.cbegin(); r = librbd::cls_client::mirror_image_list_finish(&it, &ids); }