From: Adam C. Emerson Date: Sat, 23 Dec 2017 12:28:09 +0000 (-0500) Subject: rbd: Use unqualified encode/decode X-Git-Tag: wip-pdonnell-testing-20180317.202121~583^2~14 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=97f56e675af076ddc07fff40eb6500266ca45423;p=ceph-ci.git rbd: Use unqualified encode/decode This is a portion of Part 1 of the namespace project: using ADL properly in encode and decode so we can use namespaces easily in Ceph. Signed-off-by: Adam C. Emerson --- diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc index f8ffda4a75c..939eb8f7346 100644 --- a/src/librbd/ImageWatcher.cc +++ b/src/librbd/ImageWatcher.cc @@ -32,6 +32,9 @@ using util::create_context_callback; using util::create_rados_callback; using librbd::watcher::util::HandlePayloadVisitor; +using ceph::encode; +using ceph::decode; + static const double RETRY_DELAY_SECONDS = 1.0; template @@ -291,7 +294,7 @@ void ImageWatcher::notify_header_update(librados::IoCtx &io_ctx, const std::string &oid) { // supports legacy (empty buffer) clients bufferlist bl; - ::encode(NotifyMessage(HeaderUpdatePayload()), bl); + encode(NotifyMessage(HeaderUpdatePayload()), bl); io_ctx.notify2(oid, bl, watcher::Notifier::NOTIFY_TIMEOUT, nullptr); } @@ -441,7 +444,7 @@ void ImageWatcher::notify_lock_owner(const Payload& payload, assert(m_image_ctx.owner_lock.is_locked()); bufferlist bl; - ::encode(NotifyMessage(payload), bl); + encode(NotifyMessage(payload), bl); NotifyLockOwner *notify_lock_owner = NotifyLockOwner::create( m_image_ctx, this->m_notifier, std::move(bl), on_finish); @@ -643,7 +646,7 @@ bool ImageWatcher::handle_payload(const RequestLockPayload &payload, r = m_image_ctx.get_exclusive_lock_policy()->lock_requested( payload.force); } - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } return true; } @@ -697,9 +700,9 @@ bool ImageWatcher::handle_payload(const FlattenPayload &payload, m_image_ctx.operations->execute_flatten(*prog_ctx, ctx); } - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -725,9 +728,9 @@ bool ImageWatcher::handle_payload(const ResizePayload &payload, m_image_ctx.operations->execute_resize(payload.size, payload.allow_shrink, *prog_ctx, ctx, 0); } - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -749,7 +752,7 @@ bool ImageWatcher::handle_payload(const SnapCreatePayload &payload, 0, false); return false; } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -771,7 +774,7 @@ bool ImageWatcher::handle_payload(const SnapRenamePayload &payload, new C_ResponseMessage(ack_ctx)); return false; } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -792,7 +795,7 @@ bool ImageWatcher::handle_payload(const SnapRemovePayload &payload, new C_ResponseMessage(ack_ctx)); return false; } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -813,7 +816,7 @@ bool ImageWatcher::handle_payload(const SnapProtectPayload& payload, new C_ResponseMessage(ack_ctx)); return false; } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -834,7 +837,7 @@ bool ImageWatcher::handle_payload(const SnapUnprotectPayload& payload, new C_ResponseMessage(ack_ctx)); return false; } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -859,9 +862,9 @@ bool ImageWatcher::handle_payload(const RebuildObjectMapPayload& payload, m_image_ctx.operations->execute_rebuild_object_map(*prog_ctx, ctx); } - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -881,7 +884,7 @@ bool ImageWatcher::handle_payload(const RenamePayload& payload, new C_ResponseMessage(ack_ctx)); return false; } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -903,7 +906,7 @@ bool ImageWatcher::handle_payload(const UpdateFeaturesPayload& payload, payload.features, payload.enabled, new C_ResponseMessage(ack_ctx), 0); return false; } else if (r < 0) { - ::encode(ResponseMessage(r), ack_ctx->out); + encode(ResponseMessage(r), ack_ctx->out); } } return true; @@ -916,7 +919,7 @@ bool ImageWatcher::handle_payload(const UnknownPayload &payload, if (m_image_ctx.exclusive_lock != nullptr) { int r; if (m_image_ctx.exclusive_lock->accept_requests(&r) || r < 0) { - ::encode(ResponseMessage(-EOPNOTSUPP), ack_ctx->out); + encode(ResponseMessage(-EOPNOTSUPP), ack_ctx->out); } } return true; @@ -939,7 +942,7 @@ void ImageWatcher::handle_notify(uint64_t notify_id, uint64_t handle, } else { try { bufferlist::iterator iter = bl.begin(); - ::decode(notify_message, iter); + decode(notify_message, iter); } catch (const buffer::error &err) { lderr(m_image_ctx.cct) << this << " error decoding image notification: " << err.what() << dendl; @@ -991,7 +994,7 @@ template void ImageWatcher::send_notify(const Payload &payload, Context *ctx) { bufferlist bl; - ::encode(NotifyMessage(payload), bl); + encode(NotifyMessage(payload), bl); Watcher::send_notify(bl, nullptr, ctx); } @@ -1005,7 +1008,7 @@ void ImageWatcher::C_ResponseMessage::finish(int r) { CephContext *cct = notify_ack->cct; ldout(cct, 10) << this << " C_ResponseMessage: r=" << r << dendl; - ::encode(ResponseMessage(r), notify_ack->out); + encode(ResponseMessage(r), notify_ack->out); notify_ack->complete(0); } diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc index aa058350448..90cd5e08f81 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(); try { - ::decode(client_data, bl_it); + decode(client_data, bl_it); } catch (const buffer::error &err) { lderr(cct) << this << " OpenJournalerRequest::" << __func__ << ": " << "failed to decode client data" << dendl; @@ -253,7 +253,7 @@ int allocate_journaler_tag(CephContext *cct, J *journaler, tag_data.predecessor = predecessor; bufferlist tag_bl; - ::encode(tag_data, tag_bl); + encode(tag_data, tag_bl); C_SaferCond allocate_tag_ctx; journaler->allocate_tag(tag_class, tag_bl, new_tag, &allocate_tag_ctx); @@ -483,7 +483,7 @@ int Journal::request_resync(I *image_ctx) { journal::ClientData client_data(client_meta); bufferlist client_data_bl; - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); C_SaferCond update_client_ctx; journaler.update_client(client_data_bl, &update_client_ctx); @@ -681,7 +681,7 @@ void Journal::allocate_tag(const std::string &mirror_uuid, tag_data.predecessor = predecessor; bufferlist tag_bl; - ::encode(tag_data, tag_bl); + encode(tag_data, tag_bl); C_DecodeTag *decode_tag_ctx = new C_DecodeTag(cct, &m_lock, &m_tag_tid, &m_tag_data, on_finish); @@ -723,7 +723,7 @@ uint64_t Journal::append_write_event(uint64_t offset, size_t length, ceph_clock_now()); bufferlists.emplace_back(); - ::encode(event_entry, bufferlists.back()); + encode(event_entry, bufferlists.back()); event_offset += event_length; bytes_remaining -= event_length; @@ -740,7 +740,7 @@ uint64_t Journal::append_io_event(journal::EventEntry &&event_entry, bool flush_entry, int filter_ret_val) { bufferlist bl; event_entry.timestamp = ceph_clock_now(); - ::encode(event_entry, bl); + encode(event_entry, bl); return append_io_events(event_entry.get_event_type(), {bl}, requests, offset, length, flush_entry, filter_ret_val); } @@ -851,7 +851,7 @@ void Journal::append_op_event(uint64_t op_tid, bufferlist bl; event_entry.timestamp = ceph_clock_now(); - ::encode(event_entry, bl); + encode(event_entry, bl); Future future; { @@ -888,7 +888,7 @@ void Journal::commit_op_event(uint64_t op_tid, int r, Context *on_safe) { ceph_clock_now()); bufferlist bl; - ::encode(event_entry, bl); + encode(event_entry, bl); Future op_start_future; Future op_finish_future; @@ -1585,7 +1585,7 @@ int Journal::check_resync_requested(bool *do_resync) { librbd::journal::ClientData client_data; bufferlist::iterator bl_it = client.data.begin(); try { - ::decode(client_data, bl_it); + decode(client_data, bl_it); } catch (const buffer::error &err) { lderr(cct) << this << " " << __func__ << ": " << "failed to decode client data: " << err << dendl; diff --git a/src/librbd/MirroringWatcher.cc b/src/librbd/MirroringWatcher.cc index df287506f09..200b405f1bd 100644 --- a/src/librbd/MirroringWatcher.cc +++ b/src/librbd/MirroringWatcher.cc @@ -47,7 +47,7 @@ void MirroringWatcher::notify_mode_updated(librados::IoCtx &io_ctx, ldout(cct, 20) << dendl; bufferlist bl; - ::encode(NotifyMessage{ModeUpdatedPayload{mirror_mode}}, bl); + encode(NotifyMessage{ModeUpdatedPayload{mirror_mode}}, bl); librados::AioCompletion *comp = create_rados_callback(on_finish); int r = io_ctx.aio_notify(RBD_MIRRORING, comp, bl, NOTIFY_TIMEOUT_MS, @@ -76,7 +76,7 @@ void MirroringWatcher::notify_image_updated( ldout(cct, 20) << dendl; bufferlist bl; - ::encode(NotifyMessage{ImageUpdatedPayload{ + encode(NotifyMessage{ImageUpdatedPayload{ mirror_image_state, image_id, global_image_id}}, bl); librados::AioCompletion *comp = create_rados_callback(on_finish); @@ -98,7 +98,7 @@ void MirroringWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { bufferlist::iterator iter = bl.begin(); - ::decode(notify_message, iter); + decode(notify_message, iter); } catch (const buffer::error &err) { lderr(cct) << ": error decoding image notification: " << err.what() << dendl; diff --git a/src/librbd/TrashWatcher.cc b/src/librbd/TrashWatcher.cc index bed93c67bca..1d91ea4ed6a 100644 --- a/src/librbd/TrashWatcher.cc +++ b/src/librbd/TrashWatcher.cc @@ -38,7 +38,7 @@ void TrashWatcher::notify_image_added( ldout(cct, 20) << dendl; bufferlist bl; - ::encode(NotifyMessage{ImageAddedPayload{image_id, trash_image_spec}}, bl); + encode(NotifyMessage{ImageAddedPayload{image_id, trash_image_spec}}, bl); librados::AioCompletion *comp = create_rados_callback(on_finish); int r = io_ctx.aio_notify(RBD_TRASH, comp, bl, NOTIFY_TIMEOUT_MS, nullptr); @@ -54,7 +54,7 @@ void TrashWatcher::notify_image_removed(librados::IoCtx &io_ctx, ldout(cct, 20) << dendl; bufferlist bl; - ::encode(NotifyMessage{ImageRemovedPayload{image_id}}, bl); + encode(NotifyMessage{ImageRemovedPayload{image_id}}, bl); librados::AioCompletion *comp = create_rados_callback(on_finish); int r = io_ctx.aio_notify(RBD_TRASH, comp, bl, NOTIFY_TIMEOUT_MS, nullptr); @@ -73,7 +73,7 @@ void TrashWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { bufferlist::iterator iter = bl.begin(); - ::decode(notify_message, iter); + decode(notify_message, iter); } catch (const buffer::error &err) { lderr(cct) << "error decoding image notification: " << err.what() << dendl; diff --git a/src/librbd/WatchNotifyTypes.cc b/src/librbd/WatchNotifyTypes.cc index 82d2dba44df..915c5ac89a2 100644 --- a/src/librbd/WatchNotifyTypes.cc +++ b/src/librbd/WatchNotifyTypes.cc @@ -39,13 +39,15 @@ private: } // anonymous namespace void AsyncRequestId::encode(bufferlist &bl) const { - ::encode(client_id, bl); - ::encode(request_id, bl); + using ceph::encode; + encode(client_id, bl); + encode(request_id, bl); } void AsyncRequestId::decode(bufferlist::iterator &iter) { - ::decode(client_id, iter); - ::decode(request_id, iter); + using ceph::decode; + decode(client_id, iter); + decode(request_id, iter); } void AsyncRequestId::dump(Formatter *f) const { @@ -56,12 +58,14 @@ void AsyncRequestId::dump(Formatter *f) const { } void AcquiredLockPayload::encode(bufferlist &bl) const { - ::encode(client_id, bl); + using ceph::encode; + encode(client_id, bl); } void AcquiredLockPayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; if (version >= 2) { - ::decode(client_id, iter); + decode(client_id, iter); } } @@ -72,12 +76,14 @@ void AcquiredLockPayload::dump(Formatter *f) const { } void ReleasedLockPayload::encode(bufferlist &bl) const { - ::encode(client_id, bl); + using ceph::encode; + encode(client_id, bl); } void ReleasedLockPayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; if (version >= 2) { - ::decode(client_id, iter); + decode(client_id, iter); } } @@ -88,16 +94,18 @@ void ReleasedLockPayload::dump(Formatter *f) const { } void RequestLockPayload::encode(bufferlist &bl) const { - ::encode(client_id, bl); - ::encode(force, bl); + using ceph::encode; + encode(client_id, bl); + encode(force, bl); } void RequestLockPayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; if (version >= 2) { - ::decode(client_id, iter); + decode(client_id, iter); } if (version >= 3) { - ::decode(force, iter); + decode(force, iter); } } @@ -118,11 +126,13 @@ void HeaderUpdatePayload::dump(Formatter *f) const { } void AsyncRequestPayloadBase::encode(bufferlist &bl) const { - ::encode(async_request_id, bl); + using ceph::encode; + encode(async_request_id, bl); } void AsyncRequestPayloadBase::decode(__u8 version, bufferlist::iterator &iter) { - ::decode(async_request_id, iter); + using ceph::decode; + decode(async_request_id, iter); } void AsyncRequestPayloadBase::dump(Formatter *f) const { @@ -132,15 +142,17 @@ void AsyncRequestPayloadBase::dump(Formatter *f) const { } void AsyncProgressPayload::encode(bufferlist &bl) const { + using ceph::encode; AsyncRequestPayloadBase::encode(bl); - ::encode(offset, bl); - ::encode(total, bl); + encode(offset, bl); + encode(total, bl); } void AsyncProgressPayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; AsyncRequestPayloadBase::decode(version, iter); - ::decode(offset, iter); - ::decode(total, iter); + decode(offset, iter); + decode(total, iter); } void AsyncProgressPayload::dump(Formatter *f) const { @@ -150,13 +162,15 @@ void AsyncProgressPayload::dump(Formatter *f) const { } void AsyncCompletePayload::encode(bufferlist &bl) const { + using ceph::encode; AsyncRequestPayloadBase::encode(bl); - ::encode(result, bl); + encode(result, bl); } void AsyncCompletePayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; AsyncRequestPayloadBase::decode(version, iter); - ::decode(result, iter); + decode(result, iter); } void AsyncCompletePayload::dump(Formatter *f) const { @@ -165,17 +179,19 @@ void AsyncCompletePayload::dump(Formatter *f) const { } void ResizePayload::encode(bufferlist &bl) const { - ::encode(size, bl); + using ceph::encode; + encode(size, bl); AsyncRequestPayloadBase::encode(bl); - ::encode(allow_shrink, bl); + encode(allow_shrink, bl); } void ResizePayload::decode(__u8 version, bufferlist::iterator &iter) { - ::decode(size, iter); + using ceph::decode; + decode(size, iter); AsyncRequestPayloadBase::decode(version, iter); if (version >= 4) { - ::decode(allow_shrink, iter); + decode(allow_shrink, iter); } } @@ -187,13 +203,13 @@ void ResizePayload::dump(Formatter *f) const { void SnapPayloadBase::encode(bufferlist &bl) const { using ceph::encode; - ::encode(snap_name, bl); + encode(snap_name, bl); encode(cls::rbd::SnapshotNamespaceOnDisk(snap_namespace), bl); } void SnapPayloadBase::decode(__u8 version, bufferlist::iterator &iter) { using ceph::decode; - ::decode(snap_name, iter); + decode(snap_name, iter); if (version >= 6) { cls::rbd::SnapshotNamespaceOnDisk sn; decode(sn, iter); @@ -226,12 +242,14 @@ void SnapCreatePayload::dump(Formatter *f) const { } void SnapRenamePayload::encode(bufferlist &bl) const { - ::encode(snap_id, bl); + using ceph::encode; + encode(snap_id, bl); SnapPayloadBase::encode(bl); } void SnapRenamePayload::decode(__u8 version, bufferlist::iterator &iter) { - ::decode(snap_id, iter); + using ceph::decode; + decode(snap_id, iter); SnapPayloadBase::decode(version, iter); } @@ -241,11 +259,13 @@ void SnapRenamePayload::dump(Formatter *f) const { } void RenamePayload::encode(bufferlist &bl) const { - ::encode(image_name, bl); + using ceph::encode; + encode(image_name, bl); } void RenamePayload::decode(__u8 version, bufferlist::iterator &iter) { - ::decode(image_name, iter); + using ceph::decode; + decode(image_name, iter); } void RenamePayload::dump(Formatter *f) const { @@ -253,13 +273,15 @@ void RenamePayload::dump(Formatter *f) const { } void UpdateFeaturesPayload::encode(bufferlist &bl) const { - ::encode(features, bl); - ::encode(enabled, bl); + using ceph::encode; + encode(features, bl); + encode(enabled, bl); } void UpdateFeaturesPayload::decode(__u8 version, bufferlist::iterator &iter) { - ::decode(features, iter); - ::decode(enabled, iter); + using ceph::decode; + decode(features, iter); + decode(enabled, iter); } void UpdateFeaturesPayload::dump(Formatter *f) const { @@ -291,7 +313,7 @@ void NotifyMessage::decode(bufferlist::iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; - ::decode(notify_op, iter); + decode(notify_op, iter); // select the correct payload variant based upon the encoded op switch (notify_op) { @@ -377,13 +399,13 @@ void NotifyMessage::generate_test_instances(std::list &o) { void ResponseMessage::encode(bufferlist& bl) const { ENCODE_START(1, 1, bl); - ::encode(result, bl); + encode(result, bl); ENCODE_FINISH(bl); } void ResponseMessage::decode(bufferlist::iterator& iter) { DECODE_START(1, iter); - ::decode(result, iter); + decode(result, iter); DECODE_FINISH(iter); } @@ -395,9 +417,6 @@ void ResponseMessage::generate_test_instances(std::list &o) { o.push_back(new ResponseMessage(1)); } -} // namespace watch_notify -} // namespace librbd - std::ostream &operator<<(std::ostream &out, const librbd::watch_notify::NotifyOp &op) { using namespace librbd::watch_notify; @@ -464,3 +483,5 @@ std::ostream &operator<<(std::ostream &out, << request.request_id << "]"; return out; } +} // namespace watch_notify +} // namespace librbd diff --git a/src/librbd/WatchNotifyTypes.h b/src/librbd/WatchNotifyTypes.h index 7c3255f07d5..295b5e72ab7 100644 --- a/src/librbd/WatchNotifyTypes.h +++ b/src/librbd/WatchNotifyTypes.h @@ -356,16 +356,17 @@ struct ResponseMessage { static void generate_test_instances(std::list &o); }; -} // namespace watch_notify -} // namespace librbd - std::ostream &operator<<(std::ostream &out, - const librbd::watch_notify::NotifyOp &op); + const NotifyOp &op); std::ostream &operator<<(std::ostream &out, - const librbd::watch_notify::AsyncRequestId &request); + const AsyncRequestId &request); + +WRITE_CLASS_ENCODER(AsyncRequestId); +WRITE_CLASS_ENCODER(NotifyMessage); +WRITE_CLASS_ENCODER(ResponseMessage); + +} // namespace watch_notify +} // namespace librbd -WRITE_CLASS_ENCODER(librbd::watch_notify::AsyncRequestId); -WRITE_CLASS_ENCODER(librbd::watch_notify::NotifyMessage); -WRITE_CLASS_ENCODER(librbd::watch_notify::ResponseMessage); #endif // LIBRBD_WATCH_NOTIFY_TYPES_H diff --git a/src/librbd/image_watcher/NotifyLockOwner.cc b/src/librbd/image_watcher/NotifyLockOwner.cc index f5342912009..5e03650bb49 100644 --- a/src/librbd/image_watcher/NotifyLockOwner.cc +++ b/src/librbd/image_watcher/NotifyLockOwner.cc @@ -76,7 +76,8 @@ void NotifyLockOwner::handle_notify(int r) { bufferlist::iterator iter = response.begin(); ResponseMessage response_message; - ::decode(response_message, iter); + using ceph::decode; + decode(response_message, iter); r = response_message.result; } catch (const buffer::error &err) { diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 78aeff79438..8357f58728a 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -271,9 +271,9 @@ bool compare_by_name(const child_info_t& c1, const child_info_t& c2) { bufferlist cmdbl, emptybl; __u8 c = CEPH_OSD_TMAP_SET; - ::encode(c, cmdbl); - ::encode(imgname, cmdbl); - ::encode(emptybl, cmdbl); + encode(c, cmdbl); + encode(imgname, cmdbl); + encode(emptybl, cmdbl); return io_ctx.tmap_update(RBD_DIRECTORY, cmdbl); } @@ -281,8 +281,8 @@ bool compare_by_name(const child_info_t& c1, const child_info_t& c2) { bufferlist cmdbl; __u8 c = CEPH_OSD_TMAP_RM; - ::encode(c, cmdbl); - ::encode(imgname, cmdbl); + encode(c, cmdbl); + encode(imgname, cmdbl); return io_ctx.tmap_update(RBD_DIRECTORY, cmdbl); } @@ -528,8 +528,8 @@ bool compare_by_name(const child_info_t& c1, const child_info_t& c2) bufferlist::iterator p = bl.begin(); bufferlist header; map m; - ::decode(header, p); - ::decode(m, p); + decode(header, p); + decode(m, p); for (map::iterator q = m.begin(); q != m.end(); ++q) { names.push_back(q->first); } diff --git a/src/librbd/journal/CreateRequest.cc b/src/librbd/journal/CreateRequest.cc index 033d992c848..f29f0da249f 100644 --- a/src/librbd/journal/CreateRequest.cc +++ b/src/librbd/journal/CreateRequest.cc @@ -112,7 +112,7 @@ void CreateRequest::allocate_journal_tag() { using klass = CreateRequest; Context *ctx = create_context_callback(this); - ::encode(m_tag_data, m_bl); + encode(m_tag_data, m_bl); m_journaler->allocate_tag(m_tag_class, m_bl, &m_tag, ctx); } @@ -135,7 +135,7 @@ void CreateRequest::register_client() { ldout(m_cct, 20) << this << " " << __func__ << dendl; m_bl.clear(); - ::encode(ClientData{ImageClientMeta{m_tag.tag_class}}, m_bl); + encode(ClientData{ImageClientMeta{m_tag.tag_class}}, m_bl); using klass = CreateRequest; Context *ctx = create_context_callback(this); diff --git a/src/librbd/journal/DemoteRequest.cc b/src/librbd/journal/DemoteRequest.cc index d51f777efe9..bef477d5645 100644 --- a/src/librbd/journal/DemoteRequest.cc +++ b/src/librbd/journal/DemoteRequest.cc @@ -103,7 +103,7 @@ void DemoteRequest::allocate_tag() { tag_data.predecessor = std::move(predecessor); bufferlist tag_bl; - ::encode(tag_data, tag_bl); + encode(tag_data, tag_bl); auto ctx = create_context_callback< DemoteRequest, &DemoteRequest::handle_allocate_tag>(this); @@ -133,7 +133,7 @@ void DemoteRequest::append_event() { EventEntry event_entry{DemotePromoteEvent{}, {}}; bufferlist event_entry_bl; - ::encode(event_entry, event_entry_bl); + encode(event_entry, event_entry_bl); m_journaler->start_append(0, 0, 0); m_future = m_journaler->append(m_tag_tid, event_entry_bl); diff --git a/src/librbd/journal/OpenRequest.cc b/src/librbd/journal/OpenRequest.cc index 6dbaf6ecf80..aa6cc43a09c 100644 --- a/src/librbd/journal/OpenRequest.cc +++ b/src/librbd/journal/OpenRequest.cc @@ -74,7 +74,7 @@ void OpenRequest::handle_init(int r) { librbd::journal::ClientData client_data; bufferlist::iterator bl = client.data.begin(); try { - ::decode(client_data, bl); + decode(client_data, bl); } catch (const buffer::error &err) { lderr(cct) << "failed to decode client meta data: " << err.what() << dendl; diff --git a/src/librbd/journal/PromoteRequest.cc b/src/librbd/journal/PromoteRequest.cc index fb85bcb8661..17651c2fd0b 100644 --- a/src/librbd/journal/PromoteRequest.cc +++ b/src/librbd/journal/PromoteRequest.cc @@ -87,7 +87,7 @@ void PromoteRequest::allocate_tag() { tag_data.predecessor = predecessor; bufferlist tag_bl; - ::encode(tag_data, tag_bl); + encode(tag_data, tag_bl); Context *ctx = create_context_callback< PromoteRequest, &PromoteRequest::handle_allocate_tag>(this); @@ -117,7 +117,7 @@ void PromoteRequest::append_event() { EventEntry event_entry{DemotePromoteEvent{}, {}}; bufferlist event_entry_bl; - ::encode(event_entry, event_entry_bl); + encode(event_entry, event_entry_bl); m_journaler->start_append(0, 0, 0); m_future = m_journaler->append(m_tag_tid, event_entry_bl); diff --git a/src/librbd/journal/Replay.cc b/src/librbd/journal/Replay.cc index e2e4f0e8e16..e71b37c58b4 100644 --- a/src/librbd/journal/Replay.cc +++ b/src/librbd/journal/Replay.cc @@ -189,7 +189,8 @@ Replay::~Replay() { template int Replay::decode(bufferlist::iterator *it, EventEntry *event_entry) { try { - ::decode(*event_entry, *it); + using ceph::decode; + decode(*event_entry, *it); } catch (const buffer::error &err) { return -EBADMSG; } diff --git a/src/librbd/journal/Types.cc b/src/librbd/journal/Types.cc index 2509780ac26..597c4cd4e7a 100644 --- a/src/librbd/journal/Types.cc +++ b/src/librbd/journal/Types.cc @@ -10,6 +10,9 @@ namespace librbd { namespace journal { +using ceph::encode; +using ceph::decode; + namespace { template @@ -28,7 +31,7 @@ public: template inline void operator()(const T& t) const { - ::encode(static_cast(T::TYPE), m_bl); + encode(static_cast(T::TYPE), m_bl); t.encode(m_bl); } private: @@ -69,16 +72,18 @@ private: } // anonymous namespace void AioDiscardEvent::encode(bufferlist& bl) const { - ::encode(offset, bl); - ::encode(length, bl); - ::encode(skip_partial_discard, bl); + using ceph::encode; + encode(offset, bl); + encode(length, bl); + encode(skip_partial_discard, bl); } void AioDiscardEvent::decode(__u8 version, bufferlist::iterator& it) { - ::decode(offset, it); - ::decode(length, it); + using ceph::decode; + decode(offset, it); + decode(length, it); if (version >= 4) { - ::decode(skip_partial_discard, it); + decode(skip_partial_discard, it); } } @@ -93,15 +98,17 @@ uint32_t AioWriteEvent::get_fixed_size() { } void AioWriteEvent::encode(bufferlist& bl) const { - ::encode(offset, bl); - ::encode(length, bl); - ::encode(data, bl); + using ceph::encode; + encode(offset, bl); + encode(length, bl); + encode(data, bl); } void AioWriteEvent::decode(__u8 version, bufferlist::iterator& it) { - ::decode(offset, it); - ::decode(length, it); - ::decode(data, it); + using ceph::decode; + decode(offset, it); + decode(length, it); + decode(data, it); } void AioWriteEvent::dump(Formatter *f) const { @@ -110,15 +117,17 @@ void AioWriteEvent::dump(Formatter *f) const { } void AioWriteSameEvent::encode(bufferlist& bl) const { - ::encode(offset, bl); - ::encode(length, bl); - ::encode(data, bl); + using ceph::encode; + encode(offset, bl); + encode(length, bl); + encode(data, bl); } void AioWriteSameEvent::decode(__u8 version, bufferlist::iterator& it) { - ::decode(offset, it); - ::decode(length, it); - ::decode(data, it); + using ceph::decode; + decode(offset, it); + decode(length, it); + decode(data, it); } void AioWriteSameEvent::dump(Formatter *f) const { @@ -131,17 +140,19 @@ uint32_t AioCompareAndWriteEvent::get_fixed_size() { } void AioCompareAndWriteEvent::encode(bufferlist& bl) const { - ::encode(offset, bl); - ::encode(length, bl); - ::encode(cmp_data, bl); - ::encode(write_data, bl); + using ceph::encode; + encode(offset, bl); + encode(length, bl); + encode(cmp_data, bl); + encode(write_data, bl); } void AioCompareAndWriteEvent::decode(__u8 version, bufferlist::iterator& it) { - ::decode(offset, it); - ::decode(length, it); - ::decode(cmp_data, it); - ::decode(write_data, it); + using ceph::decode; + decode(offset, it); + decode(length, it); + decode(cmp_data, it); + decode(write_data, it); } void AioCompareAndWriteEvent::dump(Formatter *f) const { @@ -159,11 +170,13 @@ void AioFlushEvent::dump(Formatter *f) const { } void OpEventBase::encode(bufferlist& bl) const { - ::encode(op_tid, bl); + using ceph::encode; + encode(op_tid, bl); } void OpEventBase::decode(__u8 version, bufferlist::iterator& it) { - ::decode(op_tid, it); + using ceph::decode; + decode(op_tid, it); } void OpEventBase::dump(Formatter *f) const { @@ -172,14 +185,16 @@ void OpEventBase::dump(Formatter *f) const { void OpFinishEvent::encode(bufferlist& bl) const { OpEventBase::encode(bl); - ::encode(op_tid, bl); - ::encode(r, bl); + using ceph::encode; + encode(op_tid, bl); + encode(r, bl); } void OpFinishEvent::decode(__u8 version, bufferlist::iterator& it) { OpEventBase::decode(version, it); - ::decode(op_tid, it); - ::decode(r, it); + using ceph::decode; + decode(op_tid, it); + decode(r, it); } void OpFinishEvent::dump(Formatter *f) const { @@ -191,14 +206,15 @@ void OpFinishEvent::dump(Formatter *f) const { void SnapEventBase::encode(bufferlist& bl) const { using ceph::encode; OpEventBase::encode(bl); - ::encode(snap_name, bl); + encode(snap_name, bl); encode(cls::rbd::SnapshotNamespaceOnDisk(snap_namespace), bl); } void SnapEventBase::decode(__u8 version, bufferlist::iterator& it) { using ceph::decode; OpEventBase::decode(version, it); - ::decode(snap_name, it); + using ceph::decode; + decode(snap_name, it); if (version >= 4) { cls::rbd::SnapshotNamespaceOnDisk sn; decode(sn, it); @@ -232,12 +248,14 @@ void SnapCreateEvent::dump(Formatter *f) const { void SnapLimitEvent::encode(bufferlist &bl) const { OpEventBase::encode(bl); - ::encode(limit, bl); + using ceph::encode; + encode(limit, bl); } void SnapLimitEvent::decode(__u8 version, bufferlist::iterator& it) { OpEventBase::decode(version, it); - ::decode(limit, it); + using ceph::decode; + decode(limit, it); } void SnapLimitEvent::dump(Formatter *f) const { @@ -247,17 +265,19 @@ void SnapLimitEvent::dump(Formatter *f) const { void SnapRenameEvent::encode(bufferlist& bl) const { OpEventBase::encode(bl); - ::encode(dst_snap_name, bl); - ::encode(snap_id, bl); - ::encode(src_snap_name, bl); + using ceph::encode; + encode(dst_snap_name, bl); + encode(snap_id, bl); + encode(src_snap_name, bl); } void SnapRenameEvent::decode(__u8 version, bufferlist::iterator& it) { + using ceph::decode; OpEventBase::decode(version, it); - ::decode(dst_snap_name, it); - ::decode(snap_id, it); + decode(dst_snap_name, it); + decode(snap_id, it); if (version >= 2) { - ::decode(src_snap_name, it); + decode(src_snap_name, it); } } @@ -270,12 +290,14 @@ void SnapRenameEvent::dump(Formatter *f) const { void RenameEvent::encode(bufferlist& bl) const { OpEventBase::encode(bl); - ::encode(image_name, bl); + using ceph::encode; + encode(image_name, bl); } void RenameEvent::decode(__u8 version, bufferlist::iterator& it) { OpEventBase::decode(version, it); - ::decode(image_name, it); + using ceph::decode; + decode(image_name, it); } void RenameEvent::dump(Formatter *f) const { @@ -285,12 +307,14 @@ void RenameEvent::dump(Formatter *f) const { void ResizeEvent::encode(bufferlist& bl) const { OpEventBase::encode(bl); - ::encode(size, bl); + using ceph::encode; + encode(size, bl); } void ResizeEvent::decode(__u8 version, bufferlist::iterator& it) { OpEventBase::decode(version, it); - ::decode(size, it); + using ceph::decode; + decode(size, it); } void ResizeEvent::dump(Formatter *f) const { @@ -309,14 +333,16 @@ void DemotePromoteEvent::dump(Formatter *f) const { void UpdateFeaturesEvent::encode(bufferlist& bl) const { OpEventBase::encode(bl); - ::encode(features, bl); - ::encode(enabled, bl); + using ceph::encode; + encode(features, bl); + encode(enabled, bl); } void UpdateFeaturesEvent::decode(__u8 version, bufferlist::iterator& it) { OpEventBase::decode(version, it); - ::decode(features, it); - ::decode(enabled, it); + using ceph::decode; + decode(features, it); + decode(enabled, it); } void UpdateFeaturesEvent::dump(Formatter *f) const { @@ -327,14 +353,16 @@ void UpdateFeaturesEvent::dump(Formatter *f) const { void MetadataSetEvent::encode(bufferlist& bl) const { OpEventBase::encode(bl); - ::encode(key, bl); - ::encode(value, bl); + using ceph::encode; + encode(key, bl); + encode(value, bl); } void MetadataSetEvent::decode(__u8 version, bufferlist::iterator& it) { OpEventBase::decode(version, it); - ::decode(key, it); - ::decode(value, it); + using ceph::decode; + decode(key, it); + decode(value, it); } void MetadataSetEvent::dump(Formatter *f) const { @@ -345,12 +373,14 @@ void MetadataSetEvent::dump(Formatter *f) const { void MetadataRemoveEvent::encode(bufferlist& bl) const { OpEventBase::encode(bl); - ::encode(key, bl); + using ceph::encode; + encode(key, bl); } void MetadataRemoveEvent::decode(__u8 version, bufferlist::iterator& it) { OpEventBase::decode(version, it); - ::decode(key, it); + using ceph::decode; + decode(key, it); } void MetadataRemoveEvent::dump(Formatter *f) const { @@ -383,7 +413,7 @@ void EventEntry::decode(bufferlist::iterator& it) { DECODE_START(1, it); uint32_t event_type; - ::decode(event_type, it); + decode(event_type, it); // select the correct payload variant based upon the encoded op switch (event_type) { @@ -463,13 +493,13 @@ void EventEntry::dump(Formatter *f) const { void EventEntry::encode_metadata(bufferlist& bl) const { ENCODE_START(1, 1, bl); - ::encode(timestamp, bl); + encode(timestamp, bl); ENCODE_FINISH(bl); } void EventEntry::decode_metadata(bufferlist::iterator& it) { DECODE_START(1, it); - ::decode(timestamp, it); + decode(timestamp, it); DECODE_FINISH(it); } @@ -528,13 +558,15 @@ void EventEntry::generate_test_instances(std::list &o) { // Journal Client void ImageClientMeta::encode(bufferlist& bl) const { - ::encode(tag_class, bl); - ::encode(resync_requested, bl); + using ceph::encode; + encode(tag_class, bl); + encode(resync_requested, bl); } void ImageClientMeta::decode(__u8 version, bufferlist::iterator& it) { - ::decode(tag_class, it); - ::decode(resync_requested, it); + using ceph::decode; + decode(tag_class, it); + decode(resync_requested, it); } void ImageClientMeta::dump(Formatter *f) const { @@ -544,17 +576,17 @@ void ImageClientMeta::dump(Formatter *f) const { void MirrorPeerSyncPoint::encode(bufferlist& bl) const { using ceph::encode; - ::encode(snap_name, bl); - ::encode(from_snap_name, bl); - ::encode(object_number, bl); + encode(snap_name, bl); + encode(from_snap_name, bl); + encode(object_number, bl); encode(cls::rbd::SnapshotNamespaceOnDisk(snap_namespace), bl); } void MirrorPeerSyncPoint::decode(__u8 version, bufferlist::iterator& it) { using ceph::decode; - ::decode(snap_name, it); - ::decode(from_snap_name, it); - ::decode(object_number, it); + decode(snap_name, it); + decode(from_snap_name, it); + decode(object_number, it); if (version >= 2) { cls::rbd::SnapshotNamespaceOnDisk sn; decode(sn, it); @@ -572,33 +604,35 @@ void MirrorPeerSyncPoint::dump(Formatter *f) const { } void MirrorPeerClientMeta::encode(bufferlist& bl) const { - ::encode(image_id, bl); - ::encode(static_cast(state), bl); - ::encode(sync_object_count, bl); - ::encode(static_cast(sync_points.size()), bl); + using ceph::encode; + encode(image_id, bl); + encode(static_cast(state), bl); + encode(sync_object_count, bl); + encode(static_cast(sync_points.size()), bl); for (auto &sync_point : sync_points) { sync_point.encode(bl); } - ::encode(snap_seqs, bl); + encode(snap_seqs, bl); } void MirrorPeerClientMeta::decode(__u8 version, bufferlist::iterator& it) { - ::decode(image_id, it); + using ceph::decode; + decode(image_id, it); uint32_t decode_state; - ::decode(decode_state, it); + decode(decode_state, it); state = static_cast(decode_state); - ::decode(sync_object_count, it); + decode(sync_object_count, it); uint32_t sync_point_count; - ::decode(sync_point_count, it); + decode(sync_point_count, it); sync_points.resize(sync_point_count); for (auto &sync_point : sync_points) { sync_point.decode(version, it); } - ::decode(snap_seqs, it); + decode(snap_seqs, it); } void MirrorPeerClientMeta::dump(Formatter *f) const { @@ -655,7 +689,7 @@ void ClientData::decode(bufferlist::iterator& it) { DECODE_START(1, it); uint32_t client_meta_type; - ::decode(client_meta_type, it); + decode(client_meta_type, it); // select the correct payload variant based upon the encoded op switch (client_meta_type) { @@ -694,17 +728,19 @@ void ClientData::generate_test_instances(std::list &o) { // Journal Tag void TagPredecessor::encode(bufferlist& bl) const { - ::encode(mirror_uuid, bl); - ::encode(commit_valid, bl); - ::encode(tag_tid, bl); - ::encode(entry_tid, bl); + using ceph::encode; + encode(mirror_uuid, bl); + encode(commit_valid, bl); + encode(tag_tid, bl); + encode(entry_tid, bl); } void TagPredecessor::decode(bufferlist::iterator& it) { - ::decode(mirror_uuid, it); - ::decode(commit_valid, it); - ::decode(tag_tid, it); - ::decode(entry_tid, it); + using ceph::decode; + decode(mirror_uuid, it); + decode(commit_valid, it); + decode(tag_tid, it); + decode(entry_tid, it); } void TagPredecessor::dump(Formatter *f) const { @@ -715,12 +751,14 @@ void TagPredecessor::dump(Formatter *f) const { } void TagData::encode(bufferlist& bl) const { - ::encode(mirror_uuid, bl); + using ceph::encode; + encode(mirror_uuid, bl); predecessor.encode(bl); } void TagData::decode(bufferlist::iterator& it) { - ::decode(mirror_uuid, 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 00fc2333ef5..b42c8d54ebc 100644 --- a/src/librbd/journal/Types.h +++ b/src/librbd/journal/Types.h @@ -673,11 +673,11 @@ struct Listener { virtual void handle_resync() = 0; }; +WRITE_CLASS_ENCODER(EventEntry); +WRITE_CLASS_ENCODER(ClientData); +WRITE_CLASS_ENCODER(TagData); + } // namespace journal } // namespace librbd -WRITE_CLASS_ENCODER(librbd::journal::EventEntry); -WRITE_CLASS_ENCODER(librbd::journal::ClientData); -WRITE_CLASS_ENCODER(librbd::journal::TagData); - #endif // CEPH_LIBRBD_JOURNAL_TYPES_H diff --git a/src/librbd/journal/Utils.cc b/src/librbd/journal/Utils.cc index e1888f0f74f..efdb17ef88b 100644 --- a/src/librbd/journal/Utils.cc +++ b/src/librbd/journal/Utils.cc @@ -16,7 +16,8 @@ namespace util { int C_DecodeTag::decode(bufferlist::iterator *it, TagData *tag_data) { try { - ::decode(*tag_data, *it); + using ceph::decode; + decode(*tag_data, *it); } catch (const buffer::error &err) { return -EBADMSG; } diff --git a/src/librbd/mirror/DisableRequest.cc b/src/librbd/mirror/DisableRequest.cc index bcbff06a452..2d9bb371eb5 100644 --- a/src/librbd/mirror/DisableRequest.cc +++ b/src/librbd/mirror/DisableRequest.cc @@ -247,7 +247,8 @@ Context *DisableRequest::handle_get_clients(int *result) { journal::ClientData client_data; bufferlist::iterator bl_it = client.data.begin(); try { - ::decode(client_data, bl_it); + using ceph::decode; + decode(client_data, bl_it); } catch (const buffer::error &err) { lderr(cct) << "failed to decode client data" << dendl; m_error_result = -EBADMSG; diff --git a/src/librbd/mirroring_watcher/Types.cc b/src/librbd/mirroring_watcher/Types.cc index 42484a6ea52..ccfb4d036c1 100644 --- a/src/librbd/mirroring_watcher/Types.cc +++ b/src/librbd/mirroring_watcher/Types.cc @@ -30,12 +30,14 @@ private: } // anonymous namespace void ModeUpdatedPayload::encode(bufferlist &bl) const { - ::encode(static_cast(mirror_mode), bl); + using ceph::encode; + encode(static_cast(mirror_mode), bl); } void ModeUpdatedPayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; uint32_t mirror_mode_decode; - ::decode(mirror_mode_decode, iter); + decode(mirror_mode_decode, iter); mirror_mode = static_cast(mirror_mode_decode); } @@ -44,18 +46,20 @@ void ModeUpdatedPayload::dump(Formatter *f) const { } void ImageUpdatedPayload::encode(bufferlist &bl) const { - ::encode(static_cast(mirror_image_state), bl); - ::encode(image_id, bl); - ::encode(global_image_id, bl); + using ceph::encode; + encode(static_cast(mirror_image_state), bl); + encode(image_id, bl); + encode(global_image_id, bl); } void ImageUpdatedPayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; uint32_t mirror_image_state_decode; - ::decode(mirror_image_state_decode, iter); + decode(mirror_image_state_decode, iter); mirror_image_state = static_cast( mirror_image_state_decode); - ::decode(image_id, iter); - ::decode(global_image_id, iter); + decode(image_id, iter); + decode(global_image_id, iter); } void ImageUpdatedPayload::dump(Formatter *f) const { @@ -84,7 +88,7 @@ void NotifyMessage::decode(bufferlist::iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; - ::decode(notify_op, iter); + decode(notify_op, iter); // select the correct payload variant based upon the encoded op switch (notify_op) { diff --git a/src/librbd/operation/RenameRequest.cc b/src/librbd/operation/RenameRequest.cc index c6e6c6422d3..a4dbf1e5235 100644 --- a/src/librbd/operation/RenameRequest.cc +++ b/src/librbd/operation/RenameRequest.cc @@ -167,11 +167,11 @@ void RenameRequest::send_update_directory() { if (image_ctx.old_format) { bufferlist cmd_bl; bufferlist empty_bl; - ::encode(static_cast<__u8>(CEPH_OSD_TMAP_SET), cmd_bl); - ::encode(m_dest_name, cmd_bl); - ::encode(empty_bl, cmd_bl); - ::encode(static_cast<__u8>(CEPH_OSD_TMAP_RM), cmd_bl); - ::encode(image_ctx.name, cmd_bl); + encode(static_cast<__u8>(CEPH_OSD_TMAP_SET), cmd_bl); + encode(m_dest_name, cmd_bl); + encode(empty_bl, cmd_bl); + encode(static_cast<__u8>(CEPH_OSD_TMAP_RM), cmd_bl); + encode(image_ctx.name, cmd_bl); op.tmap_update(cmd_bl); } else { cls_client::dir_rename_image(&op, image_ctx.name, m_dest_name, diff --git a/src/librbd/trash_watcher/Types.cc b/src/librbd/trash_watcher/Types.cc index d03bebaee1a..3063a666ff4 100644 --- a/src/librbd/trash_watcher/Types.cc +++ b/src/librbd/trash_watcher/Types.cc @@ -31,13 +31,13 @@ private: void ImageAddedPayload::encode(bufferlist &bl) const { using ceph::encode; - ::encode(image_id, bl); + encode(image_id, bl); encode(trash_image_spec, bl); } void ImageAddedPayload::decode(__u8 version, bufferlist::iterator &iter) { using ceph::decode; - ::decode(image_id, iter); + decode(image_id, iter); decode(trash_image_spec, iter); } @@ -49,11 +49,13 @@ void ImageAddedPayload::dump(Formatter *f) const { } void ImageRemovedPayload::encode(bufferlist &bl) const { - ::encode(image_id, bl); + using ceph::encode; + encode(image_id, bl); } void ImageRemovedPayload::decode(__u8 version, bufferlist::iterator &iter) { - ::decode(image_id, iter); + using ceph::decode; + decode(image_id, iter); } void ImageRemovedPayload::dump(Formatter *f) const { @@ -80,7 +82,7 @@ void NotifyMessage::decode(bufferlist::iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; - ::decode(notify_op, iter); + decode(notify_op, iter); // select the correct payload variant based upon the encoded op switch (notify_op) { diff --git a/src/librbd/watcher/Notifier.cc b/src/librbd/watcher/Notifier.cc index 8575ec68244..fb0f07fdfa7 100644 --- a/src/librbd/watcher/Notifier.cc +++ b/src/librbd/watcher/Notifier.cc @@ -27,7 +27,7 @@ void Notifier::C_AioNotify::finish(int r) { if (r == 0 || r == -ETIMEDOUT) { try { bufferlist::iterator it = out_bl.begin(); - ::decode(*response, it); + 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 b0250f026d7..8fca7e20dfd 100644 --- a/src/librbd/watcher/Types.cc +++ b/src/librbd/watcher/Types.cc @@ -8,13 +8,15 @@ namespace librbd { namespace watcher { void ClientId::encode(bufferlist &bl) const { - ::encode(gid, bl); - ::encode(handle, bl); + using ceph::encode; + encode(gid, bl); + encode(handle, bl); } void ClientId::decode(bufferlist::iterator &iter) { - ::decode(gid, iter); - ::decode(handle, iter); + using ceph::decode; + decode(gid, iter); + decode(handle, iter); } void ClientId::dump(Formatter *f) const { @@ -22,23 +24,22 @@ void ClientId::dump(Formatter *f) const { f->dump_unsigned("handle", handle); } -WRITE_CLASS_ENCODER(ClientId); - void NotifyResponse::encode(bufferlist& bl) const { - ::encode(acks, bl); - ::encode(timeouts, bl); + using ceph::encode; + encode(acks, bl); + encode(timeouts, bl); } void NotifyResponse::decode(bufferlist::iterator& iter) { - ::decode(acks, iter); - ::decode(timeouts, iter); + using ceph::decode; + decode(acks, iter); + decode(timeouts, iter); } - -} // namespace watcher -} // namespace librbd - std::ostream &operator<<(std::ostream &out, - const librbd::watcher::ClientId &client_id) { + const ClientId &client_id) { out << "[" << client_id.gid << "," << client_id.handle << "]"; return out; } + +} // namespace watcher +} // namespace librbd diff --git a/src/librbd/watcher/Types.h b/src/librbd/watcher/Types.h index e7886f6cad5..1b2c90bb56a 100644 --- a/src/librbd/watcher/Types.h +++ b/src/librbd/watcher/Types.h @@ -59,13 +59,13 @@ struct Traits { typedef librbd::Watcher Watcher; }; -} // namespace watcher -} // namespace librbd - std::ostream &operator<<(std::ostream &out, - const librbd::watcher::ClientId &client); + const ClientId &client); -WRITE_CLASS_ENCODER(librbd::watcher::ClientId); -WRITE_CLASS_ENCODER(librbd::watcher::NotifyResponse); +WRITE_CLASS_ENCODER(ClientId); +WRITE_CLASS_ENCODER(NotifyResponse); + +} // namespace watcher +} // namespace librbd #endif // CEPH_LIBRBD_WATCHER_TYPES_H diff --git a/src/librbd/watcher/Utils.h b/src/librbd/watcher/Utils.h index 78966d6a58a..92a16e6b65e 100644 --- a/src/librbd/watcher/Utils.h +++ b/src/librbd/watcher/Utils.h @@ -43,7 +43,8 @@ public: template inline void operator()(const P &payload) const { - ::encode(static_cast(P::NOTIFY_OP), m_bl); + using ceph::encode; + encode(static_cast(P::NOTIFY_OP), m_bl); payload.encode(m_bl); } diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index ce01a516ee3..e5626412f90 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -26,6 +26,8 @@ using namespace std; using namespace librbd::cls_client; using ::librbd::ParentInfo; using ::librbd::ParentSpec; +using ceph::encode; +using ceph::decode; static int snapshot_add(librados::IoCtx *ioctx, const std::string &oid, uint64_t snap_id, const std::string &snap_name) { diff --git a/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc index 09c266c0e5c..8717f684a8e 100644 --- a/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc +++ b/src/test/librbd/deep_copy/test_mock_MetadataCopyRequest.cc @@ -63,7 +63,7 @@ public: void expect_metadata_list(librbd::MockTestImageCtx &mock_image_ctx, const Metadata& metadata, int r) { bufferlist out_bl; - ::encode(metadata, out_bl); + encode(metadata, out_bl); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), exec(mock_image_ctx.header_oid, _, StrEq("rbd"), @@ -75,7 +75,7 @@ public: void expect_metadata_set(librbd::MockTestImageCtx &mock_image_ctx, const Metadata& metadata, int r) { bufferlist in_bl; - ::encode(metadata, in_bl); + encode(metadata, in_bl); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), exec(mock_image_ctx.header_oid, _, StrEq("rbd"), diff --git a/src/test/librbd/journal/test_Entries.cc b/src/test/librbd/journal/test_Entries.cc index 54be1487fae..936aad44dd0 100644 --- a/src/test/librbd/journal/test_Entries.cc +++ b/src/test/librbd/journal/test_Entries.cc @@ -107,7 +107,7 @@ public: try { bufferlist data_bl = replay_entry.get_data(); bufferlist::iterator it = data_bl.begin(); - ::decode(*event_entry, it); + decode(*event_entry, it); } catch (const buffer::error &err) { return false; } diff --git a/src/test/librbd/journal/test_mock_OpenRequest.cc b/src/test/librbd/journal/test_mock_OpenRequest.cc index 422c907874f..155c5fd5d80 100644 --- a/src/test/librbd/journal/test_mock_OpenRequest.cc +++ b/src/test/librbd/journal/test_mock_OpenRequest.cc @@ -66,7 +66,7 @@ public: client_data.client_meta = image_client_meta; cls::journal::Client client; - ::encode(client_data, client.data); + encode(client_data, client.data); EXPECT_CALL(mock_journaler, get_cached_client("", _)) .WillOnce(DoAll(SetArgPointee<1>(client), @@ -80,7 +80,7 @@ public: tag_data.mirror_uuid = "remote mirror"; bufferlist tag_data_bl; - ::encode(tag_data, tag_data_bl); + encode(tag_data, tag_data_bl); ::journal::Journaler::Tags tags = {{0, 345, {}}, {1, 345, tag_data_bl}}; EXPECT_CALL(mock_journaler, get_tags(345, _, _)) diff --git a/src/test/librbd/journal/test_mock_PromoteRequest.cc b/src/test/librbd/journal/test_mock_PromoteRequest.cc index 209249955b1..775a1463655 100644 --- a/src/test/librbd/journal/test_mock_PromoteRequest.cc +++ b/src/test/librbd/journal/test_mock_PromoteRequest.cc @@ -91,7 +91,8 @@ public: tag_data.predecessor = predecessor; bufferlist tag_data_bl; - ::encode(tag_data, tag_data_bl); + using ceph::encode; + encode(tag_data, tag_data_bl); EXPECT_CALL(mock_journaler, allocate_tag(456, ContentsEqual(tag_data_bl), _, _)) diff --git a/src/test/librbd/journal/test_mock_Replay.cc b/src/test/librbd/journal/test_mock_Replay.cc index e318cc3916b..914f4552a0f 100644 --- a/src/test/librbd/journal/test_mock_Replay.cc +++ b/src/test/librbd/journal/test_mock_Replay.cc @@ -292,7 +292,7 @@ public: EventEntry &&event_entry, Context *on_ready, Context *on_safe) { bufferlist bl; - ::encode(event_entry, bl); + encode(event_entry, bl); bufferlist::iterator it = bl.begin(); when_process(mock_journal_replay, &it, on_ready, on_safe); @@ -1812,7 +1812,7 @@ TEST_F(TestMockJournalReplay, UnknownEvent) { bufferlist bl; ENCODE_START(1, 1, bl); - ::encode(static_cast(-1), bl); + encode(static_cast(-1), bl); ENCODE_FINISH(bl); bufferlist::iterator it = bl.begin(); diff --git a/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc b/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc index 32ecc747ad1..bb83a1de711 100644 --- a/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc +++ b/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc @@ -89,7 +89,7 @@ MATCHER_P(IsLockType, exclusive, "") { bufferlist bl; bl.share(arg); bufferlist::iterator iter = bl.begin(); - ::decode(op, iter); + decode(op, iter); return op.type == (exclusive ? LOCK_EXCLUSIVE : LOCK_SHARED); } diff --git a/src/test/librbd/managed_lock/test_mock_GetLockerRequest.cc b/src/test/librbd/managed_lock/test_mock_GetLockerRequest.cc index c339427106f..627de21cd8f 100644 --- a/src/test/librbd/managed_lock/test_mock_GetLockerRequest.cc +++ b/src/test/librbd/managed_lock/test_mock_GetLockerRequest.cc @@ -70,7 +70,7 @@ public: } bufferlist bl; - ::encode(reply, bl, CEPH_FEATURES_SUPPORTED_DEFAULT); + encode(reply, bl, CEPH_FEATURES_SUPPORTED_DEFAULT); std::string str(bl.c_str(), bl.length()); expect.WillOnce(DoAll(WithArg<5>(CopyInBufferlist(str)), Return(0))); diff --git a/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc b/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc index 76bac7d1474..abb4a977057 100644 --- a/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc +++ b/src/test/librbd/managed_lock/test_mock_ReacquireRequest.cc @@ -23,7 +23,7 @@ MATCHER_P(IsLockType, exclusive, "") { bufferlist bl; bl.share(arg); bufferlist::iterator iter = bl.begin(); - ::decode(op, iter); + decode(op, iter); return op.type == (exclusive ? LOCK_EXCLUSIVE : LOCK_SHARED); } diff --git a/src/test/librbd/mirror/test_mock_DisableRequest.cc b/src/test/librbd/mirror/test_mock_DisableRequest.cc index 65f7620d110..df5a9c3e76c 100644 --- a/src/test/librbd/mirror/test_mock_DisableRequest.cc +++ b/src/test/librbd/mirror/test_mock_DisableRequest.cc @@ -163,7 +163,8 @@ public: const std::set &clients, int r) { bufferlist bl; - ::encode(clients, bl); + using ceph::encode; + encode(clients, bl); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), exec(::journal::Journaler::header_oid(mock_image_ctx.id), @@ -176,7 +177,8 @@ public: const std::string &client_id, int r) { bufferlist bl; - ::encode(client_id, bl); + using ceph::encode; + encode(client_id, bl); EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), exec(::journal::Journaler::header_oid(mock_image_ctx.id), @@ -199,8 +201,9 @@ public: template bufferlist encode(const T &t) { + using ceph::encode; bufferlist bl; - ::encode(t, bl); + encode(t, bl); return bl; } diff --git a/src/test/librbd/object_map/test_mock_LockRequest.cc b/src/test/librbd/object_map/test_mock_LockRequest.cc index 413fd71b186..5f95429acd2 100644 --- a/src/test/librbd/object_map/test_mock_LockRequest.cc +++ b/src/test/librbd/object_map/test_mock_LockRequest.cc @@ -53,7 +53,7 @@ public: rados::cls::lock::locker_info_t()}}; bufferlist bl; - ::encode(reply, bl, CEPH_FEATURES_SUPPORTED_DEFAULT); + encode(reply, bl, CEPH_FEATURES_SUPPORTED_DEFAULT); std::string str(bl.c_str(), bl.length()); expect.WillOnce(DoAll(WithArg<5>(CopyInBufferlist(str)), Return(r))); diff --git a/src/test/librbd/object_map/test_mock_UpdateRequest.cc b/src/test/librbd/object_map/test_mock_UpdateRequest.cc index 453e49cd636..297df7854a4 100644 --- a/src/test/librbd/object_map/test_mock_UpdateRequest.cc +++ b/src/test/librbd/object_map/test_mock_UpdateRequest.cc @@ -29,10 +29,10 @@ public: uint8_t new_state, const boost::optional& current_state, int r) { bufferlist bl; - ::encode(start_object_no, bl); - ::encode(end_object_no, bl); - ::encode(new_state, bl); - ::encode(current_state, bl); + encode(start_object_no, bl); + encode(end_object_no, bl); + encode(new_state, bl); + encode(current_state, bl); std::string oid(ObjectMap<>::object_map_name(ictx->id, snap_id)); if (snap_id == CEPH_NOSNAP) { diff --git a/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc b/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc index e1b4d69f93d..da344dcb964 100644 --- a/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc +++ b/src/test/librbd/operation/test_mock_SnapshotUnprotectRequest.cc @@ -51,8 +51,8 @@ public: void expect_set_protection_status(MockImageCtx &mock_image_ctx, uint64_t snap_id, uint8_t status, int r) { bufferlist bl; - ::encode(snap_id, bl); - ::encode(status, bl); + encode(snap_id, bl); + encode(status, bl); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), exec(mock_image_ctx.header_oid, _, StrEq("rbd"), @@ -87,7 +87,7 @@ public: void expect_get_children(MockImageCtx &mock_image_ctx, size_t pools, int r) { bufferlist bl; std::set children; - ::encode(children, bl); + encode(children, bl); auto &expect = EXPECT_CALL(get_mock_io_ctx(mock_image_ctx.md_ctx), exec(RBD_CHILDREN, _, StrEq("rbd"), StrEq("get_children"), _, diff --git a/src/test/librbd/test_ImageWatcher.cc b/src/test/librbd/test_ImageWatcher.cc index 6232154fa37..9b85d5d6ef2 100644 --- a/src/test/librbd/test_ImageWatcher.cc +++ b/src/test/librbd/test_ImageWatcher.cc @@ -67,7 +67,7 @@ public: bufferlist payload; bufferlist::iterator iter = bl.begin(); DECODE_START(1, iter); - ::decode(op, iter); + decode(op, iter); iter.copy_all(payload); DECODE_FINISH(iter); @@ -146,7 +146,7 @@ public: bufferlist create_response_message(int r) { bufferlist bl; - ::encode(ResponseMessage(r), bl); + encode(ResponseMessage(r), bl); return bl; } @@ -189,14 +189,14 @@ public: int notify_async_progress(librbd::ImageCtx *ictx, const AsyncRequestId &id, uint64_t offset, uint64_t total) { bufferlist bl; - ::encode(NotifyMessage(AsyncProgressPayload(id, offset, total)), bl); + encode(NotifyMessage(AsyncProgressPayload(id, offset, total)), bl); return m_ioctx.notify2(ictx->header_oid, bl, 5000, NULL); } int notify_async_complete(librbd::ImageCtx *ictx, const AsyncRequestId &id, int r) { bufferlist bl; - ::encode(NotifyMessage(AsyncCompletePayload(id, r)), bl); + encode(NotifyMessage(AsyncCompletePayload(id, r)), bl); return m_ioctx.notify2(ictx->header_oid, bl, 5000, NULL); } diff --git a/src/test/librbd/test_mirroring.cc b/src/test/librbd/test_mirroring.cc index 837ef2b88fa..ce21e3f8756 100644 --- a/src/test/librbd/test_mirroring.cc +++ b/src/test/librbd/test_mirroring.cc @@ -279,7 +279,7 @@ public: ASSERT_EQ(-ENOENT, init_ctx.wait()); bufferlist client_data_bl; - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); ASSERT_EQ(0, journaler.register_client(client_data_bl)); C_SaferCond shut_down_ctx; diff --git a/src/test/librbd/test_mock_Journal.cc b/src/test/librbd/test_mock_Journal.cc index d154284d98c..5b2da983787 100644 --- a/src/test/librbd/test_mock_Journal.cc +++ b/src/test/librbd/test_mock_Journal.cc @@ -296,7 +296,7 @@ public: client_data.client_meta = client_meta; cls::journal::Client client; - ::encode(client_data, client.data); + encode(client_data, client.data); EXPECT_CALL(mock_journaler, get_cached_client("", _)) .WillOnce(DoAll(SetArgPointee<1>(client), @@ -1331,7 +1331,7 @@ TEST_F(TestMockJournal, ResyncRequested) { tag_data.mirror_uuid = Journal<>::LOCAL_MIRROR_UUID; bufferlist tag_data_bl; - ::encode(tag_data, tag_data_bl); + encode(tag_data, tag_data_bl); expect_get_journaler_tags(mock_image_ctx, mock_journaler, 0, {{0, 0, tag_data_bl}}, 0); @@ -1383,7 +1383,7 @@ TEST_F(TestMockJournal, ForcePromoted) { tag_data.mirror_uuid = Journal<>::LOCAL_MIRROR_UUID; bufferlist tag_data_bl; - ::encode(tag_data, tag_data_bl); + encode(tag_data, tag_data_bl); expect_get_journaler_tags(mock_image_ctx, mock_journaler, 0, {{100, 0, tag_data_bl}}, 0); diff --git a/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc b/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc index 2392baeb41c..efd8e13a651 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc @@ -116,7 +116,7 @@ public: void expect_get_snapcontext(const std::string& image_id, const ::SnapContext &snapc, int r) { bufferlist bl; - ::encode(snapc, bl); + encode(snapc, bl); EXPECT_CALL(get_mock_io_ctx(m_local_io_ctx), exec(librbd::util::header_name(image_id), _, StrEq("rbd"), @@ -249,4 +249,3 @@ TEST_F(TestMockImageDeleterRemoveRequest, RemoveError) { } // namespace image_deleter } // namespace mirror } // namespace rbd - diff --git a/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc b/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc index 19103b8f5bf..e96bec640a1 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc @@ -178,7 +178,7 @@ public: void expect_mirror_image_get_image_id(const std::string& image_id, int r) { bufferlist bl; - ::encode(image_id, bl); + encode(image_id, bl); EXPECT_CALL(get_mock_io_ctx(m_local_io_ctx), exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_image_get_image_id"), _, _, _)) @@ -243,7 +243,7 @@ public: mirror_image.state = mirror_image_state; bufferlist bl; - ::encode(image_id, bl); + encode(image_id, bl); encode(mirror_image, bl); EXPECT_CALL(get_mock_io_ctx(m_local_io_ctx), diff --git a/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc index ee5e49811e3..bd8fb6893c4 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc @@ -329,7 +329,7 @@ public: const librbd::journal::ClientData &client_data, int r) { bufferlist bl; - ::encode(client_data, bl); + encode(client_data, bl); EXPECT_CALL(mock_journaler, register_client(ContentsEqual(bl), _)) .WillOnce(WithArg<1>(Invoke([this, r](Context *on_finish) { @@ -349,7 +349,7 @@ public: const librbd::journal::ClientData &client_data, int r) { bufferlist bl; - ::encode(client_data, bl); + encode(client_data, bl); EXPECT_CALL(mock_journaler, update_client(ContentsEqual(bl), _)) .WillOnce(WithArg<1>(Invoke([this, r](Context *on_finish) { @@ -437,7 +437,7 @@ public: bufferlist encode_tag_data(const librbd::journal::TagData &tag_data) { bufferlist bl; - ::encode(tag_data, bl); + encode(tag_data, bl); return bl; } @@ -483,7 +483,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, NonPrimaryRemoteSyncingState) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -532,7 +532,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, RemoteDemotePromote) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -602,7 +602,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, MultipleRemoteDemotePromotes) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -682,7 +682,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, LocalDemoteRemotePromote) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -750,7 +750,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, SplitBrainForcePromote) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -818,7 +818,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, ResyncRequested) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -874,7 +874,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, PrimaryRemote) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -901,7 +901,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, PrimaryRemote) { mirror_peer_client_meta.state = librbd::journal::MIRROR_PEER_STATE_SYNCING; client_data.client_meta = mirror_peer_client_meta; client.data.clear(); - ::encode(client_data, client.data); + encode(client_data, client.data); expect_journaler_update_client(mock_journaler, client_data, 0); // create the local image @@ -943,7 +943,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, PrimaryRemoteLocalDeleted) { cls::journal::Client client; librbd::journal::ClientData client_data{ librbd::journal::ImageClientMeta{123}}; - ::encode(client_data, client.data); + encode(client_data, client.data); ::journal::MockJournaler mock_journaler; expect_journaler_get_client(mock_journaler, librbd::Journal<>::IMAGE_CLIENT_ID, @@ -985,7 +985,7 @@ TEST_F(TestMockImageReplayerBootstrapRequest, PrimaryRemoteLocalDeleted) { mirror_peer_client_meta.state = librbd::journal::MIRROR_PEER_STATE_SYNCING; client_data.client_meta = mirror_peer_client_meta; client.data.clear(); - ::encode(client_data, client.data); + encode(client_data, client.data); expect_journaler_update_client(mock_journaler, client_data, 0); // create the missing local image diff --git a/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc index 9c60e0689e7..f067feb8c7c 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc @@ -264,7 +264,7 @@ public: void expect_mirror_image_get_image_id(librados::IoCtx &io_ctx, const std::string &image_id, int r) { bufferlist bl; - ::encode(image_id, bl); + encode(image_id, bl); EXPECT_CALL(get_mock_io_ctx(io_ctx), exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_image_get_image_id"), _, _, _)) diff --git a/src/test/rbd_mirror/image_replayer/test_mock_GetMirrorImageIdRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_GetMirrorImageIdRequest.cc index eaa9882de84..40007dfda98 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_GetMirrorImageIdRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_GetMirrorImageIdRequest.cc @@ -46,7 +46,7 @@ public: void expect_mirror_image_get_image_id(librados::IoCtx &io_ctx, const std::string &image_id, int r) { bufferlist bl; - ::encode(image_id, bl); + encode(image_id, bl); EXPECT_CALL(get_mock_io_ctx(io_ctx), exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_image_get_image_id"), _, _, _)) diff --git a/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc index 2f0e6492bbd..dba33364dcd 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc @@ -112,7 +112,7 @@ public: void expect_mirror_uuid_get(librados::IoCtx &io_ctx, const std::string &mirror_uuid, int r) { bufferlist bl; - ::encode(mirror_uuid, bl); + encode(mirror_uuid, bl); EXPECT_CALL(get_mock_io_ctx(io_ctx), exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_uuid_get"), _, _, _)) @@ -138,7 +138,7 @@ public: const librbd::journal::ClientData &client_data, int r) { bufferlist bl; - ::encode(client_data, bl); + encode(client_data, bl); EXPECT_CALL(mock_journaler, register_client(ContentsEqual(bl), _)) .WillOnce(WithArg<1>(Invoke([this, r](Context *on_finish) { @@ -165,7 +165,7 @@ TEST_F(TestMockImageReplayerPrepareRemoteImageRequest, Success) { librbd::journal::ClientData client_data{mirror_peer_client_meta}; cls::journal::Client client; client.state = cls::journal::CLIENT_STATE_DISCONNECTED; - ::encode(client_data, client.data); + encode(client_data, client.data); expect_journaler_get_client(mock_remote_journaler, "local mirror uuid", client, 0); diff --git a/src/test/rbd_mirror/pool_watcher/test_mock_RefreshImagesRequest.cc b/src/test/rbd_mirror/pool_watcher/test_mock_RefreshImagesRequest.cc index 0795fcdd445..bcaeaab1229 100644 --- a/src/test/rbd_mirror/pool_watcher/test_mock_RefreshImagesRequest.cc +++ b/src/test/rbd_mirror/pool_watcher/test_mock_RefreshImagesRequest.cc @@ -44,7 +44,7 @@ public: const std::map &ids, int r) { bufferlist bl; - ::encode(ids, bl); + encode(ids, bl); EXPECT_CALL(get_mock_io_ctx(io_ctx), exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_image_list"), _, _, _)) diff --git a/src/test/rbd_mirror/test_ImageSync.cc b/src/test/rbd_mirror/test_ImageSync.cc index 67bc8fd5900..fcf7a8f4359 100644 --- a/src/test/rbd_mirror/test_ImageSync.cc +++ b/src/test/rbd_mirror/test_ImageSync.cc @@ -68,7 +68,7 @@ public: librbd::journal::ClientData client_data(m_client_meta); bufferlist client_data_bl; - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); ASSERT_EQ(0, m_remote_journaler->register_client(client_data_bl)); } diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc index b1bf9cf6d45..2b71b6e33ba 100644 --- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc @@ -404,7 +404,7 @@ public: bufferlist encode_tag_data(const librbd::journal::TagData &tag_data) { bufferlist bl; - ::encode(tag_data, bl); + encode(tag_data, bl); return bl; } @@ -479,7 +479,7 @@ public: client_data.client_meta = image_client_meta; cls::journal::Client client; - ::encode(client_data, client.data); + encode(client_data, client.data); EXPECT_CALL(mock_journaler, get_cached_client("local_mirror_uuid", _)) .WillOnce(DoAll(SetArgPointee<1>(client), diff --git a/src/test/rbd_mirror/test_mock_InstanceWatcher.cc b/src/test/rbd_mirror/test_mock_InstanceWatcher.cc index 3cb860e6699..d02cee71ed7 100644 --- a/src/test/rbd_mirror/test_mock_InstanceWatcher.cc +++ b/src/test/rbd_mirror/test_mock_InstanceWatcher.cc @@ -505,7 +505,7 @@ TEST_F(TestMockInstanceWatcher, ImageAcquireReleaseCancel) { auto ctx = new FunctionContext( [instance_watcher, &mock_io_ctx, c, pbl](int r) { instance_watcher->cancel_notify_requests("other"); - ::encode(librbd::watcher::NotifyResponse(), *pbl); + encode(librbd::watcher::NotifyResponse(), *pbl); mock_io_ctx.get_mock_rados_client()-> finish_aio_completion(c, -ETIMEDOUT); }); @@ -526,7 +526,7 @@ TEST_F(TestMockInstanceWatcher, ImageAcquireReleaseCancel) { auto ctx = new FunctionContext( [instance_watcher, &mock_io_ctx, c, pbl](int r) { instance_watcher->cancel_notify_requests("other"); - ::encode(librbd::watcher::NotifyResponse(), *pbl); + encode(librbd::watcher::NotifyResponse(), *pbl); mock_io_ctx.get_mock_rados_client()-> finish_aio_completion(c, -ETIMEDOUT); }); @@ -571,7 +571,7 @@ TEST_F(TestMockInstanceWatcher, PeerImageRemovedCancel) { auto ctx = new FunctionContext( [instance_watcher, &mock_io_ctx, c, pbl](int r) { instance_watcher->cancel_notify_requests("other"); - ::encode(librbd::watcher::NotifyResponse(), *pbl); + encode(librbd::watcher::NotifyResponse(), *pbl); mock_io_ctx.get_mock_rados_client()-> finish_aio_completion(c, -ETIMEDOUT); }); diff --git a/src/test/rbd_mirror/test_mock_PoolWatcher.cc b/src/test/rbd_mirror/test_mock_PoolWatcher.cc index 4c7463d660c..d6545d5fa49 100644 --- a/src/test/rbd_mirror/test_mock_PoolWatcher.cc +++ b/src/test/rbd_mirror/test_mock_PoolWatcher.cc @@ -226,7 +226,7 @@ public: void expect_mirror_uuid_get(librados::IoCtx &io_ctx, const std::string &uuid, int r) { bufferlist out_bl; - ::encode(uuid, out_bl); + encode(uuid, out_bl); EXPECT_CALL(get_mock_io_ctx(io_ctx), exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_uuid_get"), diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc index ffae4896f3b..db8ec5be1a7 100644 --- a/src/tools/rbd/Utils.cc +++ b/src/tools/rbd/Utils.cc @@ -69,7 +69,7 @@ int read_string(int fd, unsigned max, std::string *out) { bl.append(buf, 4); bufferlist::iterator p = bl.begin(); uint32_t len; - ::decode(len, p); + decode(len, p); if (len > max) return -EINVAL; diff --git a/src/tools/rbd/action/Export.cc b/src/tools/rbd/action/Export.cc index de7d4c75f57..a33eb1468f3 100644 --- a/src/tools/rbd/action/Export.cc +++ b/src/tools/rbd/action/Export.cc @@ -101,16 +101,16 @@ private: bufferlist bl; __u8 tag = exists ? RBD_DIFF_WRITE : RBD_DIFF_ZERO; uint64_t len = 0; - ::encode(tag, bl); + encode(tag, bl); if (export_format == 2) { if (tag == RBD_DIFF_WRITE) len = 8 + 8 + length; else len = 8 + 8; - ::encode(len, bl); + encode(len, bl); } - ::encode(offset, bl); - ::encode(length, bl); + encode(offset, bl); + encode(length, bl); int r = bl.write_fd(edc->fd); edc->pc.update_progress(offset, edc->totalsize); @@ -142,34 +142,34 @@ int do_export_diff_fd(librbd::Image& image, const char *fromsnapname, uint64_t len = 0; if (fromsnapname) { tag = RBD_DIFF_FROM_SNAP; - ::encode(tag, bl); + encode(tag, bl); std::string from(fromsnapname); if (export_format == 2) { len = from.length() + 4; - ::encode(len, bl); + encode(len, bl); } - ::encode(from, bl); + encode(from, bl); } if (endsnapname) { tag = RBD_DIFF_TO_SNAP; - ::encode(tag, bl); + encode(tag, bl); std::string to(endsnapname); if (export_format == 2) { len = to.length() + 4; - ::encode(len, bl); + encode(len, bl); } - ::encode(to, bl); + encode(to, bl); } tag = RBD_DIFF_IMAGE_SIZE; - ::encode(tag, bl); + encode(tag, bl); uint64_t endsize = info.size; if (export_format == 2) { len = 8; - ::encode(len, bl); + encode(len, bl); } - ::encode(endsize, bl); + encode(endsize, bl); r = bl.write_fd(fd); if (r < 0) { @@ -193,7 +193,7 @@ int do_export_diff_fd(librbd::Image& image, const char *fromsnapname, { __u8 tag = RBD_DIFF_END; bufferlist bl; - ::encode(tag, bl); + encode(tag, bl); r = bl.write_fd(fd); } @@ -386,35 +386,35 @@ static int do_export_v2(librbd::Image& image, librbd::image_info_t &info, int fd // encode order tag = RBD_EXPORT_IMAGE_ORDER; length = 8; - ::encode(tag, bl); - ::encode(length, bl); - ::encode(uint64_t(info.order), bl); + encode(tag, bl); + encode(length, bl); + encode(uint64_t(info.order), bl); // encode features tag = RBD_EXPORT_IMAGE_FEATURES; uint64_t features; image.features(&features); length = 8; - ::encode(tag, bl); - ::encode(length, bl); - ::encode(features, bl); + encode(tag, bl); + encode(length, bl); + encode(features, bl); // encode stripe_unit and stripe_count tag = RBD_EXPORT_IMAGE_STRIPE_UNIT; uint64_t stripe_unit; stripe_unit = image.get_stripe_unit(); length = 8; - ::encode(tag, bl); - ::encode(length, bl); - ::encode(stripe_unit, bl); + encode(tag, bl); + encode(length, bl); + encode(stripe_unit, bl); tag = RBD_EXPORT_IMAGE_STRIPE_COUNT; uint64_t stripe_count; stripe_count = image.get_stripe_count(); length = 8; - ::encode(tag, bl); - ::encode(length, bl); - ::encode(stripe_count, bl); + encode(tag, bl); + encode(length, bl); + encode(stripe_count, bl); //retrieve metadata of image std::map imagemetas; @@ -449,15 +449,15 @@ static int do_export_v2(librbd::Image& image, librbd::image_info_t &info, int fd tag = RBD_EXPORT_IMAGE_META; length = key.length() + value.length() + 4 * 2; - ::encode(tag, bl); - ::encode(length, bl); - ::encode(key, bl); - ::encode(value, bl); + encode(tag, bl); + encode(length, bl); + encode(key, bl); + encode(value, bl); } // encode end tag tag = RBD_EXPORT_IMAGE_END; - ::encode(tag, bl); + encode(tag, bl); // write bl to fd. r = bl.write_fd(fd); @@ -476,7 +476,7 @@ static int do_export_v2(librbd::Image& image, librbd::image_info_t &info, int fd } uint64_t diff_num = snaps.size() + 1; - ::encode(diff_num, bl); + encode(diff_num, bl); r = bl.write_fd(fd); if (r < 0) { diff --git a/src/tools/rbd/action/Import.cc b/src/tools/rbd/action/Import.cc index e47eb325f6f..afdc6449382 100644 --- a/src/tools/rbd/action/Import.cc +++ b/src/tools/rbd/action/Import.cc @@ -197,7 +197,7 @@ static int do_image_resize(ImportDiffContext *idiffctx) bufferlist bl; bl.append(buf, sizeof(buf)); bufferlist::iterator p = bl.begin(); - ::decode(end_size, p); + decode(end_size, p); uint64_t cur_size; idiffctx->image->size(&cur_size); @@ -224,8 +224,8 @@ static int do_image_io(ImportDiffContext *idiffctx, bool discard, size_t sparse_ bufferlist::iterator p = bl.begin(); uint64_t image_offset, buffer_length; - ::decode(image_offset, p); - ::decode(buffer_length, p); + decode(image_offset, p); + decode(buffer_length, p); if (!discard) { bufferptr bp = buffer::create(buffer_length); @@ -333,7 +333,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(); - ::decode(*readlen, p); + decode(*readlen, p); } return 0; @@ -546,7 +546,7 @@ static int decode_and_set_image_option(int fd, uint64_t imageopt, librbd::ImageO it = bl.begin(); uint64_t val; - ::decode(val, it); + decode(val, it); if (opts.get(imageopt, &val) != 0) { opts.set(imageopt, val); @@ -664,8 +664,7 @@ static int do_import_v2(librados::Rados &rados, int fd, librbd::Image &image, bl.append(buf, sizeof(buf)); bufferlist::iterator p = bl.begin(); uint64_t diff_num; - ::decode(diff_num, p); - + decode(diff_num, p); for (size_t i = 0; i < diff_num; i++) { r = do_import_diff_fd(rados, image, fd, true, 2, sparse_size); if (r < 0) { diff --git a/src/tools/rbd/action/Journal.cc b/src/tools/rbd/action/Journal.cc index 9b047a4cd93..44df9cc1f9f 100644 --- a/src/tools/rbd/action/Journal.cc +++ b/src/tools/rbd/action/Journal.cc @@ -364,7 +364,7 @@ static int inspect_entry(bufferlist& data, bool verbose) { try { bufferlist::iterator it = data.begin(); - ::decode(event_entry, it); + decode(event_entry, it); } catch (const buffer::error &err) { std::cerr << "failed to decode event entry: " << err.what() << std::endl; return -EINVAL; diff --git a/src/tools/rbd/action/MergeDiff.cc b/src/tools/rbd/action/MergeDiff.cc index 9be899b0819..03932802cc2 100644 --- a/src/tools/rbd/action/MergeDiff.cc +++ b/src/tools/rbd/action/MergeDiff.cc @@ -67,7 +67,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(); - ::decode(*size, p); + decode(*size, p); } else { break; } @@ -103,8 +103,8 @@ 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(); - ::decode(*offset, p); - ::decode(*length, p); + decode(*offset, p); + decode(*length, p); if (!(*length)) return -ENOTSUP; @@ -122,9 +122,9 @@ static int accept_diff_body(int fd, int pd, __u8 tag, uint64_t offset, uint64_t return 0; bufferlist bl; - ::encode(tag, bl); - ::encode(offset, bl); - ::encode(length, bl); + encode(tag, bl); + encode(offset, bl); + encode(length, bl); int r; r = bl.write_fd(pd); if (r < 0) @@ -228,19 +228,19 @@ static int do_merge_diff(const char *first, const char *second, __u8 tag; if (f_from.size()) { tag = RBD_DIFF_FROM_SNAP; - ::encode(tag, bl); - ::encode(f_from, bl); + encode(tag, bl); + encode(f_from, bl); } if (s_to.size()) { tag = RBD_DIFF_TO_SNAP; - ::encode(tag, bl); - ::encode(s_to, bl); + encode(tag, bl); + encode(s_to, bl); } tag = RBD_DIFF_IMAGE_SIZE; - ::encode(tag, bl); - ::encode(s_size, bl); + encode(tag, bl); + encode(s_size, bl); r = bl.write_fd(pd); if (r < 0) { @@ -382,7 +382,7 @@ static int do_merge_diff(const char *first, const char *second, {//tail __u8 tag = RBD_DIFF_END; bufferlist bl; - ::encode(tag, bl); + encode(tag, bl); r = bl.write_fd(pd); } diff --git a/src/tools/rbd_mirror/ImageMap.cc b/src/tools/rbd_mirror/ImageMap.cc index 48f34cf3dcf..5123412c6c6 100644 --- a/src/tools/rbd_mirror/ImageMap.cc +++ b/src/tools/rbd_mirror/ImageMap.cc @@ -166,7 +166,7 @@ void ImageMap::update_image_mapping() { image_map::PolicyMetaNone policy_meta; bufferlist bl; - ::encode(image_map::PolicyData(policy_meta), bl); + encode(image_map::PolicyData(policy_meta), bl); // prepare update map std::map update_mapping; diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 6da6639b0be..a8ff166b5cb 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -1037,7 +1037,7 @@ void ImageReplayer::handle_get_remote_tag(int r) { if (r == 0) { try { bufferlist::iterator it = m_replay_tag.data.begin(); - ::decode(m_replay_tag_data, it); + decode(m_replay_tag_data, it); } catch (const buffer::error &err) { r = -EBADMSG; } diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc index 1c3f84e04d8..9e703ccbfe8 100644 --- a/src/tools/rbd_mirror/ImageSync.cc +++ b/src/tools/rbd_mirror/ImageSync.cc @@ -324,7 +324,7 @@ void ImageSync::send_update_sync_point() { bufferlist client_data_bl; librbd::journal::ClientData client_data(*m_client_meta); - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); Context *ctx = create_context_callback< ImageSync, &ImageSync::handle_update_sync_point>( @@ -385,7 +385,7 @@ void ImageSync::send_flush_sync_point() { bufferlist client_data_bl; librbd::journal::ClientData client_data(*m_client_meta); - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); Context *ctx = create_context_callback< ImageSync, &ImageSync::handle_flush_sync_point>( diff --git a/src/tools/rbd_mirror/InstanceWatcher.cc b/src/tools/rbd_mirror/InstanceWatcher.cc index 7f94976ea1c..42d0d7abddc 100644 --- a/src/tools/rbd_mirror/InstanceWatcher.cc +++ b/src/tools/rbd_mirror/InstanceWatcher.cc @@ -185,7 +185,7 @@ struct InstanceWatcher::C_NotifyInstanceRequest : public Context { try { auto iter = bl.begin(); NotifyAckPayload ack; - ::decode(ack, iter); + decode(ack, iter); if (ack.instance_id != instance_watcher->get_instance_id()) { derr << "C_NotifyInstanceRequest: " << this << " " << __func__ << ": ack instance_id (" << ack.instance_id << ") " @@ -410,7 +410,7 @@ void InstanceWatcher::notify_image_acquire( } else { uint64_t request_id = ++m_request_seq; bufferlist bl; - ::encode(NotifyMessage{ImageAcquirePayload{request_id, global_image_id}}, + encode(NotifyMessage{ImageAcquirePayload{request_id, global_image_id}}, bl); auto req = new C_NotifyInstanceRequest(this, instance_id, request_id, std::move(bl), on_notify_ack); @@ -434,7 +434,7 @@ void InstanceWatcher::notify_image_release( } else { uint64_t request_id = ++m_request_seq; bufferlist bl; - ::encode(NotifyMessage{ImageReleasePayload{request_id, global_image_id}}, + encode(NotifyMessage{ImageReleasePayload{request_id, global_image_id}}, bl); auto req = new C_NotifyInstanceRequest(this, instance_id, request_id, std::move(bl), on_notify_ack); @@ -458,7 +458,7 @@ void InstanceWatcher::notify_peer_image_removed( } else { uint64_t request_id = ++m_request_seq; bufferlist bl; - ::encode(NotifyMessage{PeerImageRemovedPayload{request_id, global_image_id, + encode(NotifyMessage{PeerImageRemovedPayload{request_id, global_image_id, peer_mirror_uuid}}, bl); auto req = new C_NotifyInstanceRequest(this, instance_id, request_id, std::move(bl), on_notify_ack); @@ -478,7 +478,7 @@ void InstanceWatcher::notify_sync_request(const std::string &sync_id, uint64_t request_id = ++m_request_seq; bufferlist bl; - ::encode(NotifyMessage{SyncRequestPayload{request_id, sync_id}}, bl); + encode(NotifyMessage{SyncRequestPayload{request_id, sync_id}}, bl); auto sync_ctx = new C_SyncRequest(this, sync_id, on_sync_start); sync_ctx->req = new C_NotifyInstanceRequest(this, "", request_id, @@ -520,7 +520,7 @@ void InstanceWatcher::notify_sync_start(const std::string &instance_id, uint64_t request_id = ++m_request_seq; bufferlist bl; - ::encode(NotifyMessage{SyncStartPayload{request_id, sync_id}}, bl); + encode(NotifyMessage{SyncStartPayload{request_id, sync_id}}, bl); auto ctx = new FunctionContext( [this, sync_id] (int r) { @@ -1092,7 +1092,7 @@ void InstanceWatcher::complete_request(const std::string &instance_id, m_requests.erase(it); } - ::encode(NotifyAckPayload(instance_id, request_id, r), on_notify_ack->out); + encode(NotifyAckPayload(instance_id, request_id, r), on_notify_ack->out); on_notify_ack->complete(0); } @@ -1107,7 +1107,7 @@ void InstanceWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { bufferlist::iterator iter = bl.begin(); - ::decode(notify_message, iter); + decode(notify_message, iter); } catch (const buffer::error &err) { derr << "error decoding image notification: " << err.what() << dendl; ctx->complete(0); diff --git a/src/tools/rbd_mirror/LeaderWatcher.cc b/src/tools/rbd_mirror/LeaderWatcher.cc index 46f555252f0..cbcce6cd206 100644 --- a/src/tools/rbd_mirror/LeaderWatcher.cc +++ b/src/tools/rbd_mirror/LeaderWatcher.cc @@ -886,7 +886,7 @@ void LeaderWatcher::notify_lock_acquired() { LeaderWatcher, &LeaderWatcher::handle_notify_lock_acquired>(this); bufferlist bl; - ::encode(NotifyMessage{LockAcquiredPayload{}}, bl); + encode(NotifyMessage{LockAcquiredPayload{}}, bl); send_notify(bl, nullptr, ctx); } @@ -920,7 +920,7 @@ void LeaderWatcher::notify_lock_released() { LeaderWatcher, &LeaderWatcher::handle_notify_lock_released>(this); bufferlist bl; - ::encode(NotifyMessage{LockReleasedPayload{}}, bl); + encode(NotifyMessage{LockReleasedPayload{}}, bl); send_notify(bl, nullptr, ctx); } @@ -961,7 +961,7 @@ void LeaderWatcher::notify_heartbeat() { LeaderWatcher, &LeaderWatcher::handle_notify_heartbeat>(this); bufferlist bl; - ::encode(NotifyMessage{HeartbeatPayload{}}, bl); + encode(NotifyMessage{HeartbeatPayload{}}, bl); m_heartbeat_response.acks.clear(); send_notify(bl, &m_heartbeat_response, ctx); @@ -1079,7 +1079,7 @@ void LeaderWatcher::handle_notify(uint64_t notify_id, uint64_t handle, NotifyMessage notify_message; try { bufferlist::iterator iter = bl.begin(); - ::decode(notify_message, iter); + decode(notify_message, iter); } catch (const buffer::error &err) { derr << ": error decoding image notification: " << err.what() << dendl; ctx->complete(0); diff --git a/src/tools/rbd_mirror/image_map/Types.cc b/src/tools/rbd_mirror/image_map/Types.cc index 02946a8c7c4..6592c057c3b 100644 --- a/src/tools/rbd_mirror/image_map/Types.cc +++ b/src/tools/rbd_mirror/image_map/Types.cc @@ -28,7 +28,8 @@ public: template inline void operator()(const T& t) const { - ::encode(static_cast(T::TYPE), m_bl); + using ceph::encode; + encode(static_cast(T::TYPE), m_bl); t.encode(m_bl); } private: @@ -82,7 +83,7 @@ void PolicyData::decode(bufferlist::iterator& it) { DECODE_START(1, it); uint32_t policy_meta_type; - ::decode(policy_meta_type, it); + decode(policy_meta_type, it); switch (policy_meta_type) { case POLICY_META_TYPE_NONE: diff --git a/src/tools/rbd_mirror/image_map/Types.h b/src/tools/rbd_mirror/image_map/Types.h index ba78c985064..91a592dfeb7 100644 --- a/src/tools/rbd_mirror/image_map/Types.h +++ b/src/tools/rbd_mirror/image_map/Types.h @@ -92,10 +92,11 @@ struct PolicyData { static void generate_test_instances(std::list &o); }; +WRITE_CLASS_ENCODER(PolicyData); + } // namespace image_map } // namespace mirror } // namespace rbd -WRITE_CLASS_ENCODER(rbd::mirror::image_map::PolicyData); #endif // CEPH_RBD_MIRROR_IMAGE_MAP_TYPES_H diff --git a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc index a8ca8ab0b29..a91f7fcffa4 100644 --- a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc @@ -125,7 +125,7 @@ void BootstrapRequest::handle_get_remote_tag_class(int r) { librbd::journal::ClientData client_data; bufferlist::iterator it = m_client.data.begin(); try { - ::decode(client_data, it); + decode(client_data, it); } catch (const buffer::error &err) { derr << ": failed to decode remote client meta data: " << err.what() << dendl; @@ -240,7 +240,7 @@ void BootstrapRequest::update_client_state() { librbd::journal::ClientData client_data(client_meta); bufferlist data_bl; - ::encode(client_data, data_bl); + encode(client_data, data_bl); Context *ctx = create_context_callback< BootstrapRequest, &BootstrapRequest::handle_update_client_state>( @@ -372,7 +372,7 @@ void BootstrapRequest::register_client() { librbd::journal::ClientData client_data{mirror_peer_client_meta}; bufferlist client_data_bl; - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); Context *ctx = create_context_callback< BootstrapRequest, &BootstrapRequest::handle_register_client>( @@ -412,7 +412,7 @@ void BootstrapRequest::update_client_image() { librbd::journal::ClientData client_data(client_meta); bufferlist data_bl; - ::encode(client_data, data_bl); + encode(client_data, data_bl); Context *ctx = create_context_callback< BootstrapRequest, &BootstrapRequest::handle_update_client_image>( @@ -553,7 +553,7 @@ void BootstrapRequest::handle_get_remote_tags(int r) { try { bufferlist::iterator it = remote_tag.data.begin(); - ::decode(remote_tag_data, it); + decode(remote_tag_data, it); remote_tag_data_valid = true; } catch (const buffer::error &err) { derr << ": failed to decode remote tag " << remote_tag.tid << ": " diff --git a/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc b/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc index 443c0c209f3..6627215e24c 100644 --- a/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc +++ b/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc @@ -147,7 +147,7 @@ void EventPreprocessor::update_client() { librbd::journal::ClientData client_data(client_meta); bufferlist data_bl; - ::encode(client_data, data_bl); + encode(client_data, data_bl); Context *ctx = create_context_callback< EventPreprocessor, &EventPreprocessor::handle_update_client>( diff --git a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc index 5fedab88a25..30688c11ede 100644 --- a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc @@ -153,7 +153,7 @@ void PrepareRemoteImageRequest::register_client() { librbd::journal::ClientData client_data{mirror_peer_client_meta}; bufferlist client_data_bl; - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); Context *ctx = create_async_context_callback( m_threads->work_queue, create_context_callback< @@ -187,7 +187,7 @@ bool PrepareRemoteImageRequest::decode_client_meta() { librbd::journal::ClientData client_data; bufferlist::iterator it = m_client.data.begin(); try { - ::decode(client_data, it); + decode(client_data, it); } catch (const buffer::error &err) { derr << "failed to decode client meta data: " << err.what() << dendl; return false; diff --git a/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc b/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc index e86765c2d4f..7b01fb5b838 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, bufferlist::iterator it = m_tag.data.begin(); try { - ::decode(tag_data, it); + decode(tag_data, it); } catch (const buffer::error &err) { derr << "error decoding tag " << master_tag_tid << ": " << err.what() << dendl; diff --git a/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc index 5323d7d2b8e..45e1a35ddca 100644 --- a/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc @@ -65,7 +65,7 @@ void SyncPointCreateRequest::send_update_client() { bufferlist client_data_bl; librbd::journal::ClientData client_data(m_client_meta_copy); - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); Context *ctx = create_context_callback< SyncPointCreateRequest, &SyncPointCreateRequest::handle_update_client>( diff --git a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc index a9d9445a0f4..d4978663aa4 100644 --- a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc @@ -180,7 +180,7 @@ void SyncPointPruneRequest::send_update_client() { bufferlist client_data_bl; librbd::journal::ClientData client_data(m_client_meta_copy); - ::encode(client_data, client_data_bl); + encode(client_data, client_data_bl); Context *ctx = create_context_callback< SyncPointPruneRequest, &SyncPointPruneRequest::handle_update_client>( diff --git a/src/tools/rbd_mirror/instance_watcher/Types.cc b/src/tools/rbd_mirror/instance_watcher/Types.cc index cdf3e26ad77..b56ed38918e 100644 --- a/src/tools/rbd_mirror/instance_watcher/Types.cc +++ b/src/tools/rbd_mirror/instance_watcher/Types.cc @@ -18,7 +18,8 @@ public: template inline void operator()(const Payload &payload) const { - ::encode(static_cast(Payload::NOTIFY_OP), m_bl); + using ceph::encode; + encode(static_cast(Payload::NOTIFY_OP), m_bl); payload.encode(m_bl); } @@ -59,11 +60,13 @@ private: } // anonymous namespace void PayloadBase::encode(bufferlist &bl) const { - ::encode(request_id, bl); + using ceph::encode; + encode(request_id, bl); } void PayloadBase::decode(__u8 version, bufferlist::iterator &iter) { - ::decode(request_id, iter); + using ceph::decode; + decode(request_id, iter); } void PayloadBase::dump(Formatter *f) const { @@ -71,13 +74,15 @@ void PayloadBase::dump(Formatter *f) const { } void ImagePayloadBase::encode(bufferlist &bl) const { + using ceph::encode; PayloadBase::encode(bl); - ::encode(global_image_id, bl); + encode(global_image_id, bl); } void ImagePayloadBase::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; PayloadBase::decode(version, iter); - ::decode(global_image_id, iter); + decode(global_image_id, iter); } void ImagePayloadBase::dump(Formatter *f) const { @@ -86,15 +91,17 @@ void ImagePayloadBase::dump(Formatter *f) const { } void PeerImageRemovedPayload::encode(bufferlist &bl) const { + using ceph::encode; PayloadBase::encode(bl); - ::encode(global_image_id, bl); - ::encode(peer_mirror_uuid, bl); + encode(global_image_id, bl); + encode(peer_mirror_uuid, bl); } void PeerImageRemovedPayload::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; PayloadBase::decode(version, iter); - ::decode(global_image_id, iter); - ::decode(peer_mirror_uuid, iter); + decode(global_image_id, iter); + decode(peer_mirror_uuid, iter); } void PeerImageRemovedPayload::dump(Formatter *f) const { @@ -104,13 +111,15 @@ void PeerImageRemovedPayload::dump(Formatter *f) const { } void SyncPayloadBase::encode(bufferlist &bl) const { + using ceph::encode; PayloadBase::encode(bl); - ::encode(sync_id, bl); + encode(sync_id, bl); } void SyncPayloadBase::decode(__u8 version, bufferlist::iterator &iter) { + using ceph::decode; PayloadBase::decode(version, iter); - ::decode(sync_id, iter); + decode(sync_id, iter); } void SyncPayloadBase::dump(Formatter *f) const { @@ -138,7 +147,7 @@ void NotifyMessage::decode(bufferlist::iterator& iter) { DECODE_START(2, iter); uint32_t notify_op; - ::decode(notify_op, iter); + decode(notify_op, iter); // select the correct payload variant based upon the encoded op switch (notify_op) { @@ -212,15 +221,17 @@ std::ostream &operator<<(std::ostream &out, const NotifyOp &op) { } void NotifyAckPayload::encode(bufferlist &bl) const { - ::encode(instance_id, bl); - ::encode(request_id, bl); - ::encode(ret_val, bl); + using ceph::encode; + encode(instance_id, bl); + encode(request_id, bl); + encode(ret_val, bl); } void NotifyAckPayload::decode(bufferlist::iterator &iter) { - ::decode(instance_id, iter); - ::decode(request_id, iter); - ::decode(ret_val, iter); + using ceph::decode; + decode(instance_id, iter); + decode(request_id, iter); + decode(ret_val, iter); } void NotifyAckPayload::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 d2460bc0878..0cd86ebad67 100644 --- a/src/tools/rbd_mirror/leader_watcher/Types.cc +++ b/src/tools/rbd_mirror/leader_watcher/Types.cc @@ -18,7 +18,8 @@ public: template inline void operator()(const Payload &payload) const { - ::encode(static_cast(Payload::NOTIFY_OP), m_bl); + using ceph::encode; + encode(static_cast(Payload::NOTIFY_OP), m_bl); payload.encode(m_bl); } @@ -105,7 +106,7 @@ void NotifyMessage::decode(bufferlist::iterator& iter) { DECODE_START(1, iter); uint32_t notify_op; - ::decode(notify_op, iter); + decode(notify_op, iter); // select the correct payload variant based upon the encoded op switch (notify_op) {