From f45e480e8ed270460c15e7fa6f45b8159e0367f3 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Sun, 24 Dec 2017 17:15:30 -0500 Subject: [PATCH] messages: 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 --- src/common/mClockCommon.h | 23 +- src/messages/MAuth.h | 14 +- src/messages/MAuthReply.h | 21 +- src/messages/MBackfillReserve.h | 31 +-- src/messages/MCacheExpire.h | 24 ++- src/messages/MClientCapRelease.h | 13 +- src/messages/MClientCaps.h | 65 +++--- src/messages/MClientLease.h | 9 +- src/messages/MClientQuota.h | 25 +-- src/messages/MClientReconnect.h | 21 +- src/messages/MClientReply.h | 120 ++++++----- src/messages/MClientRequest.h | 39 ++-- src/messages/MClientRequestForward.h | 13 +- src/messages/MClientSession.h | 9 +- src/messages/MClientSnap.h | 17 +- src/messages/MCommand.h | 9 +- src/messages/MCommandReply.h | 9 +- src/messages/MDataPing.h | 9 +- src/messages/MDentryLink.h | 21 +- src/messages/MDentryUnlink.h | 13 +- src/messages/MDirUpdate.h | 25 +-- src/messages/MDiscover.h | 25 +-- src/messages/MDiscoverReply.h | 53 ++--- src/messages/MExportCaps.h | 13 +- src/messages/MExportCapsAck.h | 5 +- src/messages/MExportDir.h | 17 +- src/messages/MExportDirAck.h | 9 +- src/messages/MExportDirCancel.h | 5 +- src/messages/MExportDirDiscover.h | 13 +- src/messages/MExportDirDiscoverAck.h | 9 +- src/messages/MExportDirFinish.h | 9 +- src/messages/MExportDirNotify.h | 21 +- src/messages/MExportDirNotifyAck.h | 10 +- src/messages/MExportDirPrep.h | 22 +- src/messages/MExportDirPrepAck.h | 10 +- src/messages/MFSMap.h | 9 +- src/messages/MFSMapUser.h | 9 +- src/messages/MForward.h | 21 +- src/messages/MGatherCaps.h | 6 +- src/messages/MGetPoolStats.h | 10 +- src/messages/MGetPoolStatsReply.h | 10 +- src/messages/MHeartbeat.h | 17 +- src/messages/MInodeFileCaps.h | 10 +- src/messages/MLock.h | 26 +-- src/messages/MLog.h | 9 +- src/messages/MLogAck.h | 14 +- src/messages/MMDSBeacon.h | 78 +++---- src/messages/MMDSCacheRejoin.h | 190 +++++++++-------- src/messages/MMDSFindIno.h | 9 +- src/messages/MMDSFindInoReply.h | 9 +- src/messages/MMDSFragmentNotify.h | 17 +- src/messages/MMDSLoadTargets.h | 10 +- src/messages/MMDSMap.h | 13 +- src/messages/MMDSOpenIno.h | 9 +- src/messages/MMDSOpenInoReply.h | 17 +- src/messages/MMDSResolve.h | 24 ++- src/messages/MMDSResolveAck.h | 10 +- src/messages/MMDSSlaveRequest.h | 65 +++--- src/messages/MMDSTableRequest.h | 17 +- src/messages/MMgrBeacon.h | 37 ++-- src/messages/MMgrConfigure.h | 9 +- src/messages/MMgrDigest.h | 9 +- src/messages/MMgrMap.h | 5 +- src/messages/MMgrOpen.h | 21 +- src/messages/MMgrReport.h | 49 ++--- src/messages/MMonCommand.h | 9 +- src/messages/MMonCommandAck.h | 13 +- src/messages/MMonElection.h | 45 ++-- src/messages/MMonGetOSDMap.h | 18 +- src/messages/MMonGetVersion.h | 9 +- src/messages/MMonGetVersionReply.h | 13 +- src/messages/MMonGlobalID.h | 5 +- src/messages/MMonHealthChecks.h | 5 +- src/messages/MMonJoin.h | 13 +- src/messages/MMonMap.h | 5 +- src/messages/MMonMetadata.h | 5 +- src/messages/MMonMgrReport.h | 9 +- src/messages/MMonPaxos.h | 53 ++--- src/messages/MMonProbe.h | 37 ++-- src/messages/MMonQuorumService.h | 9 +- src/messages/MMonScrub.h | 21 +- src/messages/MMonSubscribe.h | 9 +- src/messages/MMonSubscribeAck.h | 9 +- src/messages/MMonSync.h | 29 +-- src/messages/MNop.h | 5 +- src/messages/MOSDAlive.h | 5 +- src/messages/MOSDBackoff.h | 25 +-- src/messages/MOSDBeacon.h | 9 +- src/messages/MOSDBoot.h | 29 +-- src/messages/MOSDECSubOpRead.h | 17 +- src/messages/MOSDECSubOpReadReply.h | 17 +- src/messages/MOSDECSubOpWrite.h | 17 +- src/messages/MOSDECSubOpWriteReply.h | 17 +- src/messages/MOSDFailure.h | 21 +- src/messages/MOSDForceRecovery.h | 13 +- src/messages/MOSDFull.h | 9 +- src/messages/MOSDMap.h | 25 +-- src/messages/MOSDMarkMeDown.h | 17 +- src/messages/MOSDOp.h | 231 +++++++++++---------- src/messages/MOSDOpReply.h | 108 +++++----- src/messages/MOSDPGBackfill.h | 33 +-- src/messages/MOSDPGBackfillRemove.h | 21 +- src/messages/MOSDPGCreate.h | 13 +- src/messages/MOSDPGCreated.h | 5 +- src/messages/MOSDPGInfo.h | 9 +- src/messages/MOSDPGLog.h | 29 +-- src/messages/MOSDPGNotify.h | 9 +- src/messages/MOSDPGPull.h | 29 +-- src/messages/MOSDPGPush.h | 29 +-- src/messages/MOSDPGPushReply.h | 29 +-- src/messages/MOSDPGQuery.h | 9 +- src/messages/MOSDPGRecoveryDelete.h | 25 +-- src/messages/MOSDPGRecoveryDeleteReply.h | 25 +-- src/messages/MOSDPGRemove.h | 9 +- src/messages/MOSDPGScan.h | 33 +-- src/messages/MOSDPGTemp.h | 13 +- src/messages/MOSDPGTrim.h | 17 +- src/messages/MOSDPGUpdateLogMissing.h | 25 +-- src/messages/MOSDPGUpdateLogMissingReply.h | 21 +- src/messages/MOSDPing.h | 21 +- src/messages/MOSDRepOp.h | 63 +++--- src/messages/MOSDRepOpReply.h | 33 +-- src/messages/MOSDRepScrub.h | 45 ++-- src/messages/MOSDRepScrubMap.h | 21 +- src/messages/MOSDScrub.h | 17 +- src/messages/MOSDScrubReserve.h | 17 +- src/messages/MPGStats.h | 21 +- src/messages/MPGStatsAck.h | 5 +- src/messages/MPoolOp.h | 35 ++-- src/messages/MPoolOpReply.h | 23 +- src/messages/MRecoveryReserve.h | 21 +- src/messages/MRemoveSnaps.h | 5 +- src/messages/MRoute.h | 17 +- src/messages/MServiceMap.h | 5 +- src/messages/MStatfs.h | 9 +- src/messages/MStatfsReply.h | 5 +- src/messages/MTimeCheck.h | 25 +-- src/messages/MWatchNotify.h | 33 +-- src/messages/PaxosServiceMessage.h | 13 +- 139 files changed, 1689 insertions(+), 1499 deletions(-) diff --git a/src/common/mClockCommon.h b/src/common/mClockCommon.h index c7f64da7ec1..7904cd8cef1 100644 --- a/src/common/mClockCommon.h +++ b/src/common/mClockCommon.h @@ -14,6 +14,8 @@ #pragma once +#include +#include "include/encoding.h" #include "dmclock/src/dmclock_recs.h" // the following is done to unclobber _ASSERT_H so it returns to the @@ -22,20 +24,27 @@ namespace ceph { - namespace dmc = crimson::dmclock; +namespace dmc = ::crimson::dmclock; } -WRITE_RAW_ENCODER(dmc::ReqParams) +namespace crimson { +namespace dmclock { -inline void encode(const dmc::PhaseType &phase, bufferlist& bl, +WRITE_RAW_ENCODER(ReqParams) + +inline void encode(const PhaseType &phase, bufferlist& bl, uint64_t features=0) { - encode(static_cast(phase), bl); + using ceph::encode; + encode(static_cast(phase), bl); } -inline void decode(dmc::PhaseType &phase, bufferlist::iterator& p) +inline void decode(PhaseType &phase, bufferlist::iterator& p) { - uint8_t int_phase; - decode((uint8_t&)int_phase, p); + using ceph::decode; + std::uint8_t int_phase; + decode((std::uint8_t&)int_phase, p); phase = static_cast(int_phase); } +} +} diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h index 0a2b4302581..79e90b3aa41 100644 --- a/src/messages/MAuth.h +++ b/src/messages/MAuth.h @@ -36,20 +36,22 @@ public: } void decode_payload() override { + using ceph::encode; bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(protocol, p); - ::decode(auth_payload, p); + decode(protocol, p); + decode(auth_payload, p); if (!p.end()) - ::decode(monmap_epoch, p); + decode(monmap_epoch, p); else monmap_epoch = 0; } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(protocol, payload); - ::encode(auth_payload, payload); - ::encode(monmap_epoch, payload); + encode(protocol, payload); + encode(auth_payload, payload); + encode(monmap_epoch, payload); } bufferlist& get_auth_payload() { return auth_payload; } }; diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h index 161fe644ba1..c147430c631 100644 --- a/src/messages/MAuthReply.h +++ b/src/messages/MAuthReply.h @@ -47,18 +47,19 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(protocol, p); - ::decode(result, p); - ::decode(global_id, p); - ::decode(result_bl, p); - ::decode(result_msg, p); + decode(protocol, p); + decode(result, p); + decode(global_id, p); + decode(result_bl, p); + decode(result_msg, p); } void encode_payload(uint64_t features) override { - ::encode(protocol, payload); - ::encode(result, payload); - ::encode(global_id, payload); - ::encode(result_bl, payload); - ::encode(result_msg, payload); + using ceph::encode; + encode(protocol, payload); + encode(result, payload); + encode(global_id, payload); + encode(result_bl, payload); + encode(result_msg, payload); } }; diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h index d014031953a..2c0733b86ff 100644 --- a/src/messages/MBackfillReserve.h +++ b/src/messages/MBackfillReserve.h @@ -78,32 +78,33 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid.pgid, p); - ::decode(query_epoch, p); - ::decode(type, p); - ::decode(priority, p); - ::decode(pgid.shard, p); + decode(pgid.pgid, p); + decode(query_epoch, p); + decode(type, p); + decode(priority, p); + decode(pgid.shard, p); } void encode_payload(uint64_t features) override { + using ceph::encode; if (!HAVE_FEATURE(features, RECOVERY_RESERVATION_2)) { header.version = 3; header.compat_version = 3; - ::encode(pgid.pgid, payload); - ::encode(query_epoch, payload); - ::encode((type == RELEASE || type == TOOFULL || type == REVOKE) ? + encode(pgid.pgid, payload); + encode(query_epoch, payload); + encode((type == RELEASE || type == TOOFULL || type == REVOKE) ? REJECT : type, payload); - ::encode(priority, payload); - ::encode(pgid.shard, payload); + encode(priority, payload); + encode(pgid.shard, payload); return; } header.version = HEAD_VERSION; header.compat_version = COMPAT_VERSION; - ::encode(pgid.pgid, payload); - ::encode(query_epoch, payload); - ::encode(type, payload); - ::encode(priority, payload); - ::encode(pgid.shard, payload); + encode(pgid.pgid, payload); + encode(query_epoch, payload); + encode(type, payload); + encode(priority, payload); + encode(pgid.shard, payload); } }; diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h index a6014fcadd9..21acb5005bc 100644 --- a/src/messages/MCacheExpire.h +++ b/src/messages/MCacheExpire.h @@ -44,14 +44,16 @@ public: } void encode(bufferlist &bl) const { - ::encode(inodes, bl); - ::encode(dirs, bl); - ::encode(dentries, bl); + using ceph::encode; + encode(inodes, bl); + encode(dirs, bl); + encode(dentries, bl); } void decode(bufferlist::iterator &bl) { - ::decode(inodes, bl); - ::decode(dirs, bl); - ::decode(dentries, bl); + using ceph::decode; + decode(inodes, bl); + decode(dirs, bl); + decode(dentries, bl); } }; WRITE_CLASS_ENCODER(realm) @@ -88,14 +90,16 @@ public: } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(from, p); - ::decode(realms, p); + decode(from, p); + decode(realms, p); } void encode_payload(uint64_t features) override { - ::encode(from, payload); - ::encode(realms, payload); + using ceph::encode; + encode(from, payload); + encode(realms, payload); } }; diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h index 4b3c930a5c5..579e242bc27 100644 --- a/src/messages/MClientCapRelease.h +++ b/src/messages/MClientCapRelease.h @@ -46,17 +46,18 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(head, p); - ::decode_nohead(head.num, caps, p); + decode(head, p); + decode_nohead(head.num, caps, p); if (header.version >= 2) { - ::decode(osd_epoch_barrier, p); + decode(osd_epoch_barrier, p); } } void encode_payload(uint64_t features) override { + using ceph::encode; head.num = caps.size(); - ::encode(head, payload); - ::encode_nohead(caps, payload); - ::encode(osd_epoch_barrier, payload); + encode(head, payload); + encode_nohead(caps, payload); + encode(osd_epoch_barrier, payload); } }; diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h index acc6242ccf7..0f7c1b8c843 100644 --- a/src/messages/MClientCaps.h +++ b/src/messages/MClientCaps.h @@ -223,9 +223,9 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(head, p); + decode(head, p); ceph_mds_caps_body_legacy body; - ::decode(body, p); + decode(body, p); if (head.op == CEPH_CAP_OP_EXPORT) { peer = body.peer; } else { @@ -239,7 +239,7 @@ public: layout.from_legacy(body.layout); time_warp_seq = body.time_warp_seq; } - ::decode_nohead(head.snap_trace_len, snapbl, p); + decode_nohead(head.snap_trace_len, snapbl, p); assert(middle.length() == head.xattr_len); if (head.xattr_len) @@ -247,47 +247,48 @@ public: // conditionally decode flock metadata if (header.version >= 2) - ::decode(flockbl, p); + decode(flockbl, p); if (header.version >= 3) { if (head.op == CEPH_CAP_OP_IMPORT) - ::decode(peer, p); + decode(peer, p); } if (header.version >= 4) { - ::decode(inline_version, p); - ::decode(inline_data, p); + decode(inline_version, p); + decode(inline_data, p); } else { inline_version = CEPH_INLINE_NONE; } if (header.version >= 5) { - ::decode(osd_epoch_barrier, p); + decode(osd_epoch_barrier, p); } if (header.version >= 6) { - ::decode(oldest_flush_tid, p); + decode(oldest_flush_tid, p); } if (header.version >= 7) { - ::decode(caller_uid, p); - ::decode(caller_gid, p); + decode(caller_uid, p); + decode(caller_gid, p); } if (header.version >= 8) { - ::decode(layout.pool_ns, p); + decode(layout.pool_ns, p); } if (header.version >= 9) { - ::decode(btime, p); - ::decode(change_attr, p); + decode(btime, p); + decode(change_attr, p); } if (header.version >= 10) { - ::decode(flags, p); + decode(flags, p); } } void encode_payload(uint64_t features) override { + using ceph::encode; header.version = HEAD_VERSION; head.snap_trace_len = snapbl.length(); head.xattr_len = xattrbl.length(); - ::encode(head, payload); + encode(head, payload); ceph_mds_caps_body_legacy body; if (head.op == CEPH_CAP_OP_EXPORT) { memset(&body, 0, sizeof(body)); @@ -303,14 +304,14 @@ public: layout.to_legacy(&body.layout); body.time_warp_seq = time_warp_seq; } - ::encode(body, payload); - ::encode_nohead(snapbl, payload); + encode(body, payload); + encode_nohead(snapbl, payload); middle = xattrbl; // conditionally include flock metadata if (features & CEPH_FEATURE_FLOCK) { - ::encode(flockbl, payload); + encode(flockbl, payload); } else { header.version = 1; return; @@ -318,29 +319,29 @@ public: if (features & CEPH_FEATURE_EXPORT_PEER) { if (head.op == CEPH_CAP_OP_IMPORT) - ::encode(peer, payload); + encode(peer, payload); } else { header.version = 2; return; } if (features & CEPH_FEATURE_MDS_INLINE_DATA) { - ::encode(inline_version, payload); - ::encode(inline_data, payload); + encode(inline_version, payload); + encode(inline_data, payload); } else { - ::encode(inline_version, payload); - ::encode(bufferlist(), payload); + encode(inline_version, payload); + encode(bufferlist(), payload); } - ::encode(osd_epoch_barrier, payload); - ::encode(oldest_flush_tid, payload); - ::encode(caller_uid, payload); - ::encode(caller_gid, payload); + encode(osd_epoch_barrier, payload); + encode(oldest_flush_tid, payload); + encode(caller_uid, payload); + encode(caller_gid, payload); - ::encode(layout.pool_ns, payload); - ::encode(btime, payload); - ::encode(change_attr, payload); - ::encode(flags, payload); + encode(layout.pool_ns, payload); + encode(btime, payload); + encode(change_attr, payload); + encode(flags, payload); } }; diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h index 33d146c0ac6..ecbaa8ddd44 100644 --- a/src/messages/MClientLease.h +++ b/src/messages/MClientLease.h @@ -70,12 +70,13 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(h, p); - ::decode(dname, p); + decode(h, p); + decode(dname, p); } void encode_payload(uint64_t features) override { - ::encode(h, payload); - ::encode(dname, payload); + using ceph::encode; + encode(h, payload); + encode(dname, payload); } }; diff --git a/src/messages/MClientQuota.h b/src/messages/MClientQuota.h index 3c8ad4ea746..08385ca794a 100644 --- a/src/messages/MClientQuota.h +++ b/src/messages/MClientQuota.h @@ -28,21 +28,22 @@ public: } void encode_payload(uint64_t features) override { - ::encode(ino, payload); - ::encode(rstat.rctime, payload); - ::encode(rstat.rbytes, payload); - ::encode(rstat.rfiles, payload); - ::encode(rstat.rsubdirs, payload); - ::encode(quota, payload); + using ceph::encode; + encode(ino, payload); + encode(rstat.rctime, payload); + encode(rstat.rbytes, payload); + encode(rstat.rfiles, payload); + encode(rstat.rsubdirs, payload); + encode(quota, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(ino, p); - ::decode(rstat.rctime, p); - ::decode(rstat.rbytes, p); - ::decode(rstat.rfiles, p); - ::decode(rstat.rsubdirs, p); - ::decode(quota, p); + decode(ino, p); + decode(rstat.rctime, p); + decode(rstat.rbytes, p); + decode(rstat.rfiles, p); + decode(rstat.rsubdirs, p); + decode(quota, p); assert(p.end()); } }; diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h index 86b83a4ac73..18ce1fd9ace 100644 --- a/src/messages/MClientReconnect.h +++ b/src/messages/MClientReconnect.h @@ -53,16 +53,17 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; data.clear(); if (features & CEPH_FEATURE_MDSENC) { - ::encode(caps, data); + encode(caps, data); header.version = HEAD_VERSION; } else if (features & CEPH_FEATURE_FLOCK) { // encode with old cap_reconnect_t encoding __u32 n = caps.size(); - ::encode(n, data); + encode(n, data); for (map::iterator p = caps.begin(); p != caps.end(); ++p) { - ::encode(p->first, data); + encode(p->first, data); p->second.encode_old(data); } header.version = 2; @@ -72,33 +73,33 @@ public: map ocaps; for (map::iterator p = caps.begin(); p != caps.end(); p++) ocaps[p->first] = p->second; - ::encode(ocaps, data); + encode(ocaps, data); } - ::encode_nohead(realms, data); + encode_nohead(realms, data); } void decode_payload() override { bufferlist::iterator p = data.begin(); if (header.version >= 3) { // new protocol - ::decode(caps, p); + decode(caps, p); } else if (header.version == 2) { __u32 n; - ::decode(n, p); + decode(n, p); inodeno_t ino; while (n--) { - ::decode(ino, p); + decode(ino, p); caps[ino].decode_old(p); } } else { // compat crap map ocaps; - ::decode(ocaps, p); + decode(ocaps, p); for (map::iterator q = ocaps.begin(); q != ocaps.end(); q++) caps[q->first] = q->second; } while (!p.end()) { realms.push_back(ceph_mds_snaprealm_reconnect()); - ::decode(realms.back(), p); + decode(realms.back(), p); } } diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h index 75a2e12147b..3e979b3fe1c 100644 --- a/src/messages/MClientReply.h +++ b/src/messages/MClientReply.h @@ -54,14 +54,16 @@ struct LeaseStat { LeaseStat() : mask(0), duration_ms(0), seq(0) {} void encode(bufferlist &bl) const { - ::encode(mask, bl); - ::encode(duration_ms, bl); - ::encode(seq, bl); + using ceph::encode; + encode(mask, bl); + encode(duration_ms, bl); + encode(seq, bl); } void decode(bufferlist::iterator &bl) { - ::decode(mask, bl); - ::decode(duration_ms, bl); - ::decode(seq, bl); + using ceph::decode; + decode(mask, bl); + decode(duration_ms, bl); + decode(seq, bl); } }; WRITE_CLASS_ENCODER(LeaseStat) @@ -82,14 +84,16 @@ struct DirStat { } void encode(bufferlist& bl) { - ::encode(frag, bl); - ::encode(auth, bl); - ::encode(dist, bl); + using ceph::encode; + encode(frag, bl); + encode(auth, bl); + encode(dist, bl); } void decode(bufferlist::iterator& p) { - ::decode(frag, p); - ::decode(auth, p); - ::decode(dist, p); + using ceph::decode; + decode(frag, p); + decode(auth, p); + decode(dist, p); } // see CDir::encode_dirstat for encoder. @@ -131,64 +135,65 @@ struct InodeStat { } void decode(bufferlist::iterator &p, uint64_t features) { - ::decode(vino.ino, p); - ::decode(vino.snapid, p); - ::decode(rdev, p); - ::decode(version, p); - ::decode(xattr_version, p); - ::decode(cap, p); + using ceph::decode; + decode(vino.ino, p); + decode(vino.snapid, p); + decode(rdev, p); + decode(version, p); + decode(xattr_version, p); + decode(cap, p); { ceph_file_layout legacy_layout; - ::decode(legacy_layout, p); + decode(legacy_layout, p); layout.from_legacy(legacy_layout); } - ::decode(ctime, p); - ::decode(mtime, p); - ::decode(atime, p); - ::decode(time_warp_seq, p); - ::decode(size, p); - ::decode(max_size, p); - ::decode(truncate_size, p); - ::decode(truncate_seq, p); - ::decode(mode, p); - ::decode(uid, p); - ::decode(gid, p); - ::decode(nlink, p); - ::decode(dirstat.nfiles, p); - ::decode(dirstat.nsubdirs, p); - ::decode(rstat.rbytes, p); - ::decode(rstat.rfiles, p); - ::decode(rstat.rsubdirs, p); - ::decode(rstat.rctime, p); - - ::decode(dirfragtree, p); - - ::decode(symlink, p); + decode(ctime, p); + decode(mtime, p); + decode(atime, p); + decode(time_warp_seq, p); + decode(size, p); + decode(max_size, p); + decode(truncate_size, p); + decode(truncate_seq, p); + decode(mode, p); + decode(uid, p); + decode(gid, p); + decode(nlink, p); + decode(dirstat.nfiles, p); + decode(dirstat.nsubdirs, p); + decode(rstat.rbytes, p); + decode(rstat.rfiles, p); + decode(rstat.rsubdirs, p); + decode(rstat.rctime, p); + + decode(dirfragtree, p); + + decode(symlink, p); if (features & CEPH_FEATURE_DIRLAYOUTHASH) - ::decode(dir_layout, p); + decode(dir_layout, p); else memset(&dir_layout, 0, sizeof(dir_layout)); - ::decode(xattrbl, p); + decode(xattrbl, p); if (features & CEPH_FEATURE_MDS_INLINE_DATA) { - ::decode(inline_version, p); - ::decode(inline_data, p); + decode(inline_version, p); + decode(inline_data, p); } else { inline_version = CEPH_INLINE_NONE; } if (features & CEPH_FEATURE_MDS_QUOTA) - ::decode(quota, p); + decode(quota, p); else memset("a, 0, sizeof(quota)); if ((features & CEPH_FEATURE_FS_FILE_LAYOUT_V2)) - ::decode(layout.pool_ns, p); + decode(layout.pool_ns, p); if ((features & CEPH_FEATURE_FS_BTIME)) { - ::decode(btime, p); - ::decode(change_attr, p); + decode(btime, p); + decode(change_attr, p); } else { btime = utime_t(); change_attr = 0; @@ -255,17 +260,18 @@ public: // serialization void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(head, p); - ::decode(trace_bl, p); - ::decode(extra_bl, p); - ::decode(snapbl, p); + decode(head, p); + decode(trace_bl, p); + decode(extra_bl, p); + decode(snapbl, p); assert(p.end()); } void encode_payload(uint64_t features) override { - ::encode(head, payload); - ::encode(trace_bl, payload); - ::encode(extra_bl, payload); - ::encode(snapbl, payload); + using ceph::encode; + encode(head, payload); + encode(trace_bl, payload); + encode(extra_bl, payload); + encode(snapbl, payload); } diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index d78f4171b26..1baa12f068c 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -63,13 +63,15 @@ public: item(rel), dname(name) {} void encode(bufferlist& bl) const { + using ceph::encode; item.dname_len = dname.length(); - ::encode(item, bl); - ::encode_nohead(dname, bl); + encode(item, bl); + encode_nohead(dname, bl); } void decode(bufferlist::iterator& bl) { - ::decode(item, bl); - ::decode_nohead(item.dname_len, dname, bl); + using ceph::decode; + decode(item, bl); + decode_nohead(item.dname_len, dname, bl); } }; vector releases; @@ -174,11 +176,11 @@ public: bufferlist::iterator p = payload.begin(); if (header.version >= 4) { - ::decode(head, p); + decode(head, p); } else { struct ceph_mds_request_head_legacy old_mds_head; - ::decode(old_mds_head, p); + decode(old_mds_head, p); copy_from_legacy_head(&head, &old_mds_head); head.version = 0; @@ -193,33 +195,34 @@ public: } } - ::decode(path, p); - ::decode(path2, p); - ::decode_nohead(head.num_releases, releases, p); + decode(path, p); + decode(path2, p); + decode_nohead(head.num_releases, releases, p); if (header.version >= 2) - ::decode(stamp, p); + decode(stamp, p); if (header.version >= 4) // epoch 3 was for a ceph_mds_request_args change - ::decode(gid_list, p); + decode(gid_list, p); } void encode_payload(uint64_t features) override { + using ceph::encode; head.num_releases = releases.size(); head.version = CEPH_MDS_REQUEST_HEAD_VERSION; if (features & CEPH_FEATURE_FS_BTIME) { - ::encode(head, payload); + encode(head, payload); } else { struct ceph_mds_request_head_legacy old_mds_head; copy_to_legacy_head(&old_mds_head, &head); - ::encode(old_mds_head, payload); + encode(old_mds_head, payload); } - ::encode(path, payload); - ::encode(path2, payload); - ::encode_nohead(releases, payload); - ::encode(stamp, payload); - ::encode(gid_list, payload); + encode(path, payload); + encode(path2, payload); + encode_nohead(releases, payload); + encode(stamp, payload); + encode(gid_list, payload); } const char *get_type_name() const override { return "creq"; } diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h index 9312849f88e..32650d74056 100644 --- a/src/messages/MClientRequestForward.h +++ b/src/messages/MClientRequestForward.h @@ -51,16 +51,17 @@ public: } void encode_payload(uint64_t features) override { - ::encode(dest_mds, payload); - ::encode(num_fwd, payload); - ::encode(client_must_resend, payload); + using ceph::encode; + encode(dest_mds, payload); + encode(num_fwd, payload); + encode(client_must_resend, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(dest_mds, p); - ::decode(num_fwd, p); - ::decode(client_must_resend, p); + decode(dest_mds, p); + decode(num_fwd, p); + decode(client_must_resend, p); } }; diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h index c94100408df..c1126e679a8 100644 --- a/src/messages/MClientSession.h +++ b/src/messages/MClientSession.h @@ -62,20 +62,21 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(head, p); + decode(head, p); if (header.version >= 2) { - ::decode(client_meta, p); + decode(client_meta, p); } } void encode_payload(uint64_t features) override { - ::encode(head, payload); + using ceph::encode; + encode(head, payload); if (client_meta.empty()) { // If we're not trying to send any metadata (always the case if // we are a server) then send older-format message to avoid upsetting // old kernel clients. header.version = 1; } else { - ::encode(client_meta, payload); + encode(client_meta, payload); header.version = HEAD_VERSION; } diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h index 8e572bfd88d..e1fda989c04 100644 --- a/src/messages/MClientSnap.h +++ b/src/messages/MClientSnap.h @@ -44,20 +44,21 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; head.num_split_inos = split_inos.size(); head.num_split_realms = split_realms.size(); head.trace_len = bl.length(); - ::encode(head, payload); - ::encode_nohead(split_inos, payload); - ::encode_nohead(split_realms, payload); - ::encode_nohead(bl, payload); + encode(head, payload); + encode_nohead(split_inos, payload); + encode_nohead(split_realms, payload); + encode_nohead(bl, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(head, p); - ::decode_nohead(head.num_split_inos, split_inos, p); - ::decode_nohead(head.num_split_realms, split_realms, p); - ::decode_nohead(head.trace_len, bl, p); + decode(head, p); + decode_nohead(head.num_split_inos, split_inos, p); + decode_nohead(head.num_split_realms, split_realms, p); + decode_nohead(head.trace_len, bl, p); assert(p.end()); } diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h index d6f59fe4c08..3b0ffb7cd5e 100644 --- a/src/messages/MCommand.h +++ b/src/messages/MCommand.h @@ -45,13 +45,14 @@ public: } void encode_payload(uint64_t features) override { - ::encode(fsid, payload); - ::encode(cmd, payload); + using ceph::encode; + encode(fsid, payload); + encode(cmd, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(cmd, p); + decode(fsid, p); + decode(cmd, p); } }; diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h index 9bb803dd579..4af21e4da04 100644 --- a/src/messages/MCommandReply.h +++ b/src/messages/MCommandReply.h @@ -42,13 +42,14 @@ public: } void encode_payload(uint64_t features) override { - ::encode(r, payload); - ::encode(rs, payload); + using ceph::encode; + encode(r, payload); + encode(rs, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(r, p); - ::decode(rs, p); + decode(r, p); + decode(rs, p); } }; diff --git a/src/messages/MDataPing.h b/src/messages/MDataPing.h index 8fdde1ec6f4..7e2944cec19 100644 --- a/src/messages/MDataPing.h +++ b/src/messages/MDataPing.h @@ -75,12 +75,13 @@ private: public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(tag, p); - ::decode(counter, p); + decode(tag, p); + decode(counter, p); } void encode_payload(uint64_t features) override { - ::encode(tag, payload); - ::encode(counter, payload); + using ceph::encode; + encode(tag, payload); + encode(counter, payload); } const char *get_type_name() const override { return "data_ping"; } diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h index 5b4b6b28045..0e1c1606479 100644 --- a/src/messages/MDentryLink.h +++ b/src/messages/MDentryLink.h @@ -49,18 +49,19 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(subtree, p); - ::decode(dirfrag, p); - ::decode(dn, p); - ::decode(is_primary, p); - ::decode(bl, p); + decode(subtree, p); + decode(dirfrag, p); + decode(dn, p); + decode(is_primary, p); + decode(bl, p); } void encode_payload(uint64_t features) override { - ::encode(subtree, payload); - ::encode(dirfrag, payload); - ::encode(dn, payload); - ::encode(is_primary, payload); - ::encode(bl, payload); + using ceph::encode; + encode(subtree, payload); + encode(dirfrag, payload); + encode(dn, payload); + encode(is_primary, payload); + encode(bl, payload); } }; diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h index baf54ae0a41..86f5f3d5f93 100644 --- a/src/messages/MDentryUnlink.h +++ b/src/messages/MDentryUnlink.h @@ -43,14 +43,15 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(dn, p); - ::decode(straybl, p); + decode(dirfrag, p); + decode(dn, p); + decode(straybl, p); } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(dn, payload); - ::encode(straybl, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(dn, payload); + encode(straybl, payload); } }; diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h index bbe82319f3f..68a5a35ba68 100644 --- a/src/messages/MDirUpdate.h +++ b/src/messages/MDirUpdate.h @@ -64,21 +64,22 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(from_mds, p); - ::decode(dirfrag, p); - ::decode(dir_rep, p); - ::decode(discover, p); - ::decode(dir_rep_by, p); - ::decode(path, p); + decode(from_mds, p); + decode(dirfrag, p); + decode(dir_rep, p); + decode(discover, p); + decode(dir_rep_by, p); + decode(path, p); } void encode_payload(uint64_t features) override { - ::encode(from_mds, payload); - ::encode(dirfrag, payload); - ::encode(dir_rep, payload); - ::encode(discover, payload); - ::encode(dir_rep_by, payload); - ::encode(path, payload); + using ceph::encode; + encode(from_mds, payload); + encode(dirfrag, payload); + encode(dir_rep, payload); + encode(discover, payload); + encode(dir_rep_by, payload); + encode(path, payload); } }; diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h index e674181e364..3f86cbf46a1 100644 --- a/src/messages/MDiscover.h +++ b/src/messages/MDiscover.h @@ -71,20 +71,21 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(base_ino, p); - ::decode(base_dir_frag, p); - ::decode(snapid, p); - ::decode(want, p); - ::decode(want_base_dir, p); - ::decode(want_xlocked, p); + decode(base_ino, p); + decode(base_dir_frag, p); + decode(snapid, p); + decode(want, p); + decode(want_base_dir, p); + decode(want_xlocked, p); } void encode_payload(uint64_t features) override { - ::encode(base_ino, payload); - ::encode(base_dir_frag, payload); - ::encode(snapid, payload); - ::encode(want, payload); - ::encode(want_base_dir, payload); - ::encode(want_xlocked, payload); + using ceph::encode; + encode(base_ino, payload); + encode(base_dir_frag, payload); + encode(snapid, payload); + encode(want, payload); + encode(want_base_dir, payload); + encode(want_xlocked, payload); } }; diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h index 47df407c18b..6e064c2ddb3 100644 --- a/src/messages/MDiscoverReply.h +++ b/src/messages/MDiscoverReply.h @@ -176,34 +176,35 @@ public: // ... void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(base_ino, p); - ::decode(base_dir_frag, p); - ::decode(wanted_base_dir, p); - ::decode(wanted_xlocked, p); - ::decode(wanted_snapid, p); - ::decode(flag_error_dn, p); - ::decode(flag_error_dir, p); - ::decode(error_dentry, p); - ::decode(dir_auth_hint, p); - ::decode(unsolicited, p); - - ::decode(starts_with, p); - ::decode(trace, p); + decode(base_ino, p); + decode(base_dir_frag, p); + decode(wanted_base_dir, p); + decode(wanted_xlocked, p); + decode(wanted_snapid, p); + decode(flag_error_dn, p); + decode(flag_error_dir, p); + decode(error_dentry, p); + decode(dir_auth_hint, p); + decode(unsolicited, p); + + decode(starts_with, p); + decode(trace, p); } void encode_payload(uint64_t features) override { - ::encode(base_ino, payload); - ::encode(base_dir_frag, payload); - ::encode(wanted_base_dir, payload); - ::encode(wanted_xlocked, payload); - ::encode(wanted_snapid, payload); - ::encode(flag_error_dn, payload); - ::encode(flag_error_dir, payload); - ::encode(error_dentry, payload); - ::encode(dir_auth_hint, payload); - ::encode(unsolicited, payload); - - ::encode(starts_with, payload); - ::encode(trace, payload); + using ceph::encode; + encode(base_ino, payload); + encode(base_dir_frag, payload); + encode(wanted_base_dir, payload); + encode(wanted_xlocked, payload); + encode(wanted_snapid, payload); + encode(flag_error_dn, payload); + encode(flag_error_dir, payload); + encode(error_dentry, payload); + encode(dir_auth_hint, payload); + encode(unsolicited, payload); + + encode(starts_with, payload); + encode(trace, payload); } }; diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h index 8ce4b858de9..4a373cc092b 100644 --- a/src/messages/MExportCaps.h +++ b/src/messages/MExportCaps.h @@ -37,15 +37,16 @@ public: } void encode_payload(uint64_t features) override { - ::encode(ino, payload); - ::encode(cap_bl, payload); - ::encode(client_map, payload, features); + using ceph::encode; + encode(ino, payload); + encode(cap_bl, payload); + encode(client_map, payload, features); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(ino, p); - ::decode(cap_bl, p); - ::decode(client_map, p); + decode(ino, p); + decode(cap_bl, p); + decode(client_map, p); } }; diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h index 5a21d9465de..c11178f58fb 100644 --- a/src/messages/MExportCapsAck.h +++ b/src/messages/MExportCapsAck.h @@ -37,11 +37,12 @@ public: } void encode_payload(uint64_t features) override { - ::encode(ino, payload); + using ceph::encode; + encode(ino, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(ino, p); + decode(ino, p); } }; diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h index 8271d80de3c..e2c987c5b7a 100644 --- a/src/messages/MExportDir.h +++ b/src/messages/MExportDir.h @@ -45,17 +45,18 @@ public: } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(bounds, payload); - ::encode(export_data, payload); - ::encode(client_map, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(bounds, payload); + encode(export_data, payload); + encode(client_map, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(bounds, p); - ::decode(export_data, p); - ::decode(client_map, p); + decode(dirfrag, p); + decode(bounds, p); + decode(export_data, p); + decode(client_map, p); } }; diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h index f7b1beb9023..b52ac3b552c 100644 --- a/src/messages/MExportDirAck.h +++ b/src/messages/MExportDirAck.h @@ -40,12 +40,13 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(imported_caps, p); + decode(dirfrag, p); + decode(imported_caps, p); } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(imported_caps, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(imported_caps, payload); } }; diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h index a3c9c5172fb..a6652451660 100644 --- a/src/messages/MExportDirCancel.h +++ b/src/messages/MExportDirCancel.h @@ -39,11 +39,12 @@ public: } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); + using ceph::encode; + encode(dirfrag, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); + decode(dirfrag, p); } }; diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h index 892b45147a5..c3b4acddfb8 100644 --- a/src/messages/MExportDirDiscover.h +++ b/src/messages/MExportDirDiscover.h @@ -50,15 +50,16 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(from, p); - ::decode(dirfrag, p); - ::decode(path, p); + decode(from, p); + decode(dirfrag, p); + decode(path, p); } void encode_payload(uint64_t features) override { - ::encode(from, payload); - ::encode(dirfrag, payload); - ::encode(path, payload); + using ceph::encode; + encode(from, payload); + encode(dirfrag, payload); + encode(path, payload); } }; diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h index 3b43cdab6bd..8e5c4255dd8 100644 --- a/src/messages/MExportDirDiscoverAck.h +++ b/src/messages/MExportDirDiscoverAck.h @@ -48,12 +48,13 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(success, p); + decode(dirfrag, p); + decode(success, p); } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(success, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(success, payload); } }; diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h index 8cea97757dd..d020d58c17d 100644 --- a/src/messages/MExportDirFinish.h +++ b/src/messages/MExportDirFinish.h @@ -40,13 +40,14 @@ public: } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(last, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(last, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(last, p); + decode(dirfrag, p); + decode(last, p); } }; diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h index 6f881412bac..2c40c598937 100644 --- a/src/messages/MExportDirNotify.h +++ b/src/messages/MExportDirNotify.h @@ -60,19 +60,20 @@ public: } void encode_payload(uint64_t features) override { - ::encode(base, payload); - ::encode(ack, payload); - ::encode(old_auth, payload); - ::encode(new_auth, payload); - ::encode(bounds, payload); + using ceph::encode; + encode(base, payload); + encode(ack, payload); + encode(old_auth, payload); + encode(new_auth, payload); + encode(bounds, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(base, p); - ::decode(ack, p); - ::decode(old_auth, p); - ::decode(new_auth, p); - ::decode(bounds, p); + decode(base, p); + decode(ack, p); + decode(old_auth, p); + decode(new_auth, p); + decode(bounds, p); } }; diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h index 7edbbaf9f8f..c03d1b2b983 100644 --- a/src/messages/MExportDirNotifyAck.h +++ b/src/messages/MExportDirNotifyAck.h @@ -40,13 +40,15 @@ public: } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(new_auth, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(new_auth, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(new_auth, p); + decode(dirfrag, p); + decode(new_auth, p); } }; diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h index 22717dd61b0..aa024f12248 100644 --- a/src/messages/MExportDirPrep.h +++ b/src/messages/MExportDirPrep.h @@ -65,20 +65,22 @@ public: } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(basedir, p); - ::decode(bounds, p); - ::decode(traces, p); - ::decode(bystanders, p); + decode(dirfrag, p); + decode(basedir, p); + decode(bounds, p); + decode(traces, p); + decode(bystanders, p); } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(basedir, payload); - ::encode(bounds, payload); - ::encode(traces, payload); - ::encode(bystanders, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(basedir, payload); + encode(bounds, payload); + encode(traces, payload); + encode(bystanders, payload); } }; diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h index d623d1acc09..f4a174a3e44 100644 --- a/src/messages/MExportDirPrepAck.h +++ b/src/messages/MExportDirPrepAck.h @@ -41,13 +41,15 @@ public: } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(dirfrag, p); - ::decode(success, p); + decode(dirfrag, p); + decode(success, p); } void encode_payload(uint64_t features) override { - ::encode(dirfrag, payload); - ::encode(success, payload); + using ceph::encode; + encode(dirfrag, payload); + encode(success, payload); } }; diff --git a/src/messages/MFSMap.h b/src/messages/MFSMap.h index 6e1348bcc2e..71166e2929b 100644 --- a/src/messages/MFSMap.h +++ b/src/messages/MFSMap.h @@ -49,12 +49,13 @@ public: // marshalling void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(fsmap, p); + decode(epoch, p); + decode(fsmap, p); } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(fsmap, payload, features); + using ceph::encode; + encode(epoch, payload); + encode(fsmap, payload, features); } }; diff --git a/src/messages/MFSMapUser.h b/src/messages/MFSMapUser.h index 2cd94cfd482..498cf1836e7 100644 --- a/src/messages/MFSMapUser.h +++ b/src/messages/MFSMapUser.h @@ -47,12 +47,13 @@ public: // marshalling void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(fsmap, p); + decode(epoch, p); + decode(fsmap, p); } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(fsmap, payload, features); + using ceph::encode; + encode(epoch, payload); + encode(fsmap, payload, features); } }; diff --git a/src/messages/MForward.h b/src/messages/MForward.h index 333475e4662..8954a10fa36 100644 --- a/src/messages/MForward.h +++ b/src/messages/MForward.h @@ -69,9 +69,10 @@ private: public: void encode_payload(uint64_t features) override { - ::encode(tid, payload); - ::encode(client, payload, features); - ::encode(client_caps, payload, features); + using ceph::encode; + encode(tid, payload); + encode(client, payload, features); + encode(client_caps, payload, features); // Encode client message with intersection of target and source // features. This could matter if the semantics of the encoded // message are changed when reencoding with more features than the @@ -81,18 +82,18 @@ public: msg->clear_payload(); } encode_message(msg, features & con_features, payload); - ::encode(con_features, payload); - ::encode(entity_name, payload); + encode(con_features, payload); + encode(entity_name, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(tid, p); - ::decode(client, p); - ::decode(client_caps, p); + decode(tid, p); + decode(client, p); + decode(client_caps, p); msg = (PaxosServiceMessage *)decode_message(NULL, 0, p); - ::decode(con_features, p); - ::decode(entity_name, p); + decode(con_features, p); + decode(entity_name, p); } PaxosServiceMessage *claim_message() { diff --git a/src/messages/MGatherCaps.h b/src/messages/MGatherCaps.h index 4d73efad1a5..b3f0147919a 100644 --- a/src/messages/MGatherCaps.h +++ b/src/messages/MGatherCaps.h @@ -20,11 +20,13 @@ public: } void encode_payload(uint64_t features) override { - ::encode(ino, payload); + using ceph::encode; + encode(ino, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(ino, p); + decode(ino, p); } }; diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h index ff6d2b103aa..27758a12fad 100644 --- a/src/messages/MGetPoolStats.h +++ b/src/messages/MGetPoolStats.h @@ -40,15 +40,17 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(pools, payload); + encode(fsid, payload); + encode(pools, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(pools, p); + decode(fsid, p); + decode(pools, p); } }; diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h index de5719e9666..258660aac85 100644 --- a/src/messages/MGetPoolStatsReply.h +++ b/src/messages/MGetPoolStatsReply.h @@ -38,15 +38,17 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(pool_stats, payload, features); + encode(fsid, payload); + encode(pool_stats, payload, features); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(pool_stats, p); + decode(fsid, p); + decode(pool_stats, p); } }; diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h index ff3d178d5b0..730f47f9f20 100644 --- a/src/messages/MHeartbeat.h +++ b/src/messages/MHeartbeat.h @@ -51,19 +51,20 @@ public: const char *get_type_name() const override { return "HB"; } void encode_payload(uint64_t features) override { - ::encode(load, payload); - ::encode(beat, payload); - ::encode(import_map, payload); - ::encode(last_epoch_under, payload); + using ceph::encode; + encode(load, payload); + encode(beat, payload); + encode(import_map, payload); + encode(last_epoch_under, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); utime_t now(ceph_clock_now()); - ::decode(load, now, p); - ::decode(beat, p); - ::decode(import_map, p); + decode(load, now, p); + decode(beat, p); + decode(import_map, p); if (header.version >= 2) { - ::decode(last_epoch_under, p); + decode(last_epoch_under, p); } else { last_epoch_under = 0; } diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h index 73cc5623ec2..eb4239ce058 100644 --- a/src/messages/MInodeFileCaps.h +++ b/src/messages/MInodeFileCaps.h @@ -40,13 +40,15 @@ public: } void encode_payload(uint64_t features) override { - ::encode(ino, payload); - ::encode(caps, payload); + using ceph::encode; + encode(ino, payload); + encode(caps, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(ino, p); - ::decode(caps, p); + decode(ino, p); + decode(caps, p); } }; diff --git a/src/messages/MLock.h b/src/messages/MLock.h index 44ccb4f2c21..d367a408d08 100644 --- a/src/messages/MLock.h +++ b/src/messages/MLock.h @@ -73,21 +73,23 @@ public: } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(asker, p); - ::decode(action, p); - ::decode(reqid, p); - ::decode(lock_type, p); - ::decode(object_info, p); - ::decode(lockdata, p); + decode(asker, p); + decode(action, p); + decode(reqid, p); + decode(lock_type, p); + decode(object_info, p); + decode(lockdata, p); } void encode_payload(uint64_t features) override { - ::encode(asker, payload); - ::encode(action, payload); - ::encode(reqid, payload); - ::encode(lock_type, payload); - ::encode(object_info, payload); - ::encode(lockdata, payload); + using ceph::encode; + encode(asker, payload); + encode(action, payload); + encode(reqid, payload); + encode(lock_type, payload); + encode(object_info, payload); + encode(lockdata, payload); } }; diff --git a/src/messages/MLog.h b/src/messages/MLog.h index fb86930759c..c790529ca61 100644 --- a/src/messages/MLog.h +++ b/src/messages/MLog.h @@ -43,15 +43,16 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(entries, payload, features); + encode(fsid, payload); + encode(entries, payload, features); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(entries, p); + decode(fsid, p); + decode(entries, p); } }; diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h index fa7b4e53445..a2578fdced2 100644 --- a/src/messages/MLogAck.h +++ b/src/messages/MLogAck.h @@ -33,16 +33,18 @@ public: } void encode_payload(uint64_t features) override { - ::encode(fsid, payload); - ::encode(last, payload); - ::encode(channel, payload); + using ceph::encode; + encode(fsid, payload); + encode(last, payload); + encode(channel, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(last, p); + decode(fsid, p); + decode(last, p); if (!p.end()) - ::decode(channel, p); + decode(channel, p); } }; diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h index a328f8ec853..1d3bac8eb35 100644 --- a/src/messages/MMDSBeacon.h +++ b/src/messages/MMDSBeacon.h @@ -43,7 +43,7 @@ enum mds_metric_t { MDS_HEALTH_CACHE_OVERSIZED }; -static inline const char *mds_metric_name(mds_metric_t m) +inline const char *mds_metric_name(mds_metric_t m) { switch (m) { case MDS_HEALTH_TRIM: return "MDS_TRIM"; @@ -62,7 +62,7 @@ static inline const char *mds_metric_name(mds_metric_t m) } } -static inline const char *mds_metric_summary(mds_metric_t m) +inline const char *mds_metric_summary(mds_metric_t m) { switch (m) { case MDS_HEALTH_TRIM: @@ -115,20 +115,20 @@ struct MDSHealthMetric void encode(bufferlist& bl) const { ENCODE_START(1, 1, bl); assert(type != MDS_HEALTH_NULL); - ::encode((uint16_t)type, bl); - ::encode((uint8_t)sev, bl); - ::encode(message, bl); - ::encode(metadata, bl); + encode((uint16_t)type, bl); + encode((uint8_t)sev, bl); + encode(message, bl); + encode(metadata, bl); ENCODE_FINISH(bl); } void decode(bufferlist::iterator& bl) { DECODE_START(1, bl); - ::decode((uint16_t&)type, bl); + decode((uint16_t&)type, bl); assert(type != MDS_HEALTH_NULL); - ::decode((uint8_t&)sev, bl); - ::decode(message, bl); - ::decode(metadata, bl); + decode((uint8_t&)sev, bl); + decode(message, bl); + decode(metadata, bl); DECODE_FINISH(bl); } @@ -154,13 +154,13 @@ struct MDSHealth void encode(bufferlist& bl) const { ENCODE_START(1, 1, bl); - ::encode(metrics, bl); + encode(metrics, bl); ENCODE_FINISH(bl); } void decode(bufferlist::iterator& bl) { DECODE_START(1, bl); - ::decode(metrics, bl); + decode(metrics, bl); DECODE_FINISH(bl); } @@ -248,42 +248,44 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(global_id, payload); - ::encode((__u32)state, payload); - ::encode(seq, payload); - ::encode(name, payload); - ::encode(standby_for_rank, payload); - ::encode(standby_for_name, payload); - ::encode(compat, payload); - ::encode(health, payload); + encode(fsid, payload); + encode(global_id, payload); + encode((__u32)state, payload); + encode(seq, payload); + encode(name, payload); + encode(standby_for_rank, payload); + encode(standby_for_name, payload); + encode(compat, payload); + encode(health, payload); if (state == MDSMap::STATE_BOOT) { - ::encode(sys_info, payload); + encode(sys_info, payload); } - ::encode(mds_features, payload); - ::encode(standby_for_fscid, payload); - ::encode(standby_replay, payload); + encode(mds_features, payload); + encode(standby_for_fscid, payload); + encode(standby_replay, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(global_id, p); - ::decode((__u32&)state, p); - ::decode(seq, p); - ::decode(name, p); - ::decode(standby_for_rank, p); - ::decode(standby_for_name, p); - ::decode(compat, p); - ::decode(health, p); + decode(fsid, p); + decode(global_id, p); + decode((__u32&)state, p); + decode(seq, p); + decode(name, p); + decode(standby_for_rank, p); + decode(standby_for_name, p); + decode(compat, p); + decode(health, p); if (state == MDSMap::STATE_BOOT) { - ::decode(sys_info, p); + decode(sys_info, p); } - ::decode(mds_features, p); - ::decode(standby_for_fscid, p); + decode(mds_features, p); + decode(standby_for_fscid, p); if (header.version >= 7) { - ::decode(standby_replay, p); + decode(standby_replay, p); } if (header.version < 7 && state == MDSMap::STATE_STANDBY_REPLAY) { diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h index a8d0528a4b4..b572be12069 100644 --- a/src/messages/MMDSCacheRejoin.h +++ b/src/messages/MMDSCacheRejoin.h @@ -53,18 +53,20 @@ class MMDSCacheRejoin : public Message { nonce(n), caps_wanted(cw), filelock(dl), nestlock(nl), dftlock(dftl) { } void encode(bufferlist &bl) const { - ::encode(nonce, bl); - ::encode(caps_wanted, bl); - ::encode(filelock, bl); - ::encode(nestlock, bl); - ::encode(dftlock, bl); + using ceph::encode; + encode(nonce, bl); + encode(caps_wanted, bl); + encode(filelock, bl); + encode(nestlock, bl); + encode(dftlock, bl); } void decode(bufferlist::iterator &bl) { - ::decode(nonce, bl); - ::decode(caps_wanted, bl); - ::decode(filelock, bl); - ::decode(nestlock, bl); - ::decode(dftlock, bl); + using ceph::decode; + decode(nonce, bl); + decode(caps_wanted, bl); + decode(filelock, bl); + decode(nestlock, bl); + decode(dftlock, bl); } }; WRITE_CLASS_ENCODER(inode_strong) @@ -75,12 +77,14 @@ class MMDSCacheRejoin : public Message { dirfrag_strong() {} dirfrag_strong(int n, int dr) : nonce(n), dir_rep(dr) {} void encode(bufferlist &bl) const { - ::encode(nonce, bl); - ::encode(dir_rep, bl); + using ceph::encode; + encode(nonce, bl); + encode(dir_rep, bl); } void decode(bufferlist::iterator &bl) { - ::decode(nonce, bl); - ::decode(dir_rep, bl); + using ceph::decode; + decode(nonce, bl); + decode(dir_rep, bl); } }; WRITE_CLASS_ENCODER(dirfrag_strong) @@ -100,20 +104,22 @@ class MMDSCacheRejoin : public Message { bool is_remote() { return remote_ino > 0; } bool is_null() { return ino == 0 && remote_ino == 0; } void encode(bufferlist &bl) const { - ::encode(first, bl); - ::encode(ino, bl); - ::encode(remote_ino, bl); - ::encode(remote_d_type, bl); - ::encode(nonce, bl); - ::encode(lock, bl); + using ceph::encode; + encode(first, bl); + encode(ino, bl); + encode(remote_ino, bl); + encode(remote_d_type, bl); + encode(nonce, bl); + encode(lock, bl); } void decode(bufferlist::iterator &bl) { - ::decode(first, bl); - ::decode(ino, bl); - ::decode(remote_ino, bl); - ::decode(remote_d_type, bl); - ::decode(nonce, bl); - ::decode(lock, bl); + using ceph::decode; + decode(first, bl); + decode(ino, bl); + decode(remote_ino, bl); + decode(remote_d_type, bl); + decode(nonce, bl); + decode(lock, bl); } }; WRITE_CLASS_ENCODER(dn_strong) @@ -124,12 +130,14 @@ class MMDSCacheRejoin : public Message { dn_weak() : ino(0) {} dn_weak(snapid_t f, inodeno_t pi) : first(f), ino(pi) {} void encode(bufferlist &bl) const { - ::encode(first, bl); - ::encode(ino, bl); + using ceph::encode; + encode(first, bl); + encode(ino, bl); } void decode(bufferlist::iterator &bl) { - ::decode(first, bl); - ::decode(ino, bl); + using ceph::decode; + decode(first, bl); + decode(ino, bl); } }; WRITE_CLASS_ENCODER(dn_weak) @@ -140,14 +148,16 @@ class MMDSCacheRejoin : public Message { struct lock_bls { bufferlist file, nest, dft; void encode(bufferlist& bl) const { - ::encode(file, bl); - ::encode(nest, bl); - ::encode(dft, bl); + using ceph::encode; + encode(file, bl); + encode(nest, bl); + encode(dft, bl); } void decode(bufferlist::iterator& bl) { - ::decode(file, bl); - ::decode(nest, bl); - ::decode(dft, bl); + using ceph::decode; + decode(file, bl); + decode(nest, bl); + decode(dft, bl); } }; WRITE_CLASS_ENCODER(lock_bls) @@ -181,12 +191,14 @@ class MMDSCacheRejoin : public Message { slave_reqid(const metareqid_t& r, __u32 a) : reqid(r), attempt(a) {} void encode(bufferlist& bl) const { - ::encode(reqid, bl); - ::encode(attempt, bl); + using ceph::encode; + encode(reqid, bl); + encode(attempt, bl); } void decode(bufferlist::iterator& bl) { - ::decode(reqid, bl); - ::decode(attempt, bl); + using ceph::decode; + decode(reqid, bl); + decode(attempt, bl); } }; map > authpinned_inodes; @@ -220,17 +232,19 @@ public: strong_inodes[i] = inode_strong(n, cw, dl, nl, dftl); } void add_inode_locks(CInode *in, __u32 nonce, bufferlist& bl) { - ::encode(in->inode.ino, inode_locks); - ::encode(in->last, inode_locks); - ::encode(nonce, inode_locks); - ::encode(bl, inode_locks); + using ceph::encode; + encode(in->inode.ino, inode_locks); + encode(in->last, inode_locks); + encode(nonce, inode_locks); + encode(bl, inode_locks); } void add_inode_base(CInode *in, uint64_t features) { - ::encode(in->inode.ino, inode_base); - ::encode(in->last, inode_base); + using ceph::encode; + encode(in->inode.ino, inode_base); + encode(in->last, inode_base); bufferlist bl; in->_encode_base(bl, features); - ::encode(bl, inode_base); + encode(bl, inode_base); } void add_inode_authpin(vinodeno_t ino, const metareqid_t& ri, __u32 attempt) { authpinned_inodes[ino].push_back(slave_reqid(ri, attempt)); @@ -286,49 +300,51 @@ public: // -- encoding -- void encode_payload(uint64_t features) override { - ::encode(op, payload); - ::encode(strong_inodes, payload); - ::encode(inode_base, payload); - ::encode(inode_locks, payload); - ::encode(inode_scatterlocks, payload); - ::encode(authpinned_inodes, payload); - ::encode(frozen_authpin_inodes, payload); - ::encode(xlocked_inodes, payload); - ::encode(wrlocked_inodes, payload); - ::encode(cap_exports, payload); - ::encode(client_map, payload, features); - ::encode(imported_caps, payload); - ::encode(strong_dirfrags, payload); - ::encode(dirfrag_bases, payload); - ::encode(weak, payload); - ::encode(weak_dirfrags, payload); - ::encode(weak_inodes, payload); - ::encode(strong_dentries, payload); - ::encode(authpinned_dentries, payload); - ::encode(xlocked_dentries, payload); + using ceph::encode; + encode(op, payload); + encode(strong_inodes, payload); + encode(inode_base, payload); + encode(inode_locks, payload); + encode(inode_scatterlocks, payload); + encode(authpinned_inodes, payload); + encode(frozen_authpin_inodes, payload); + encode(xlocked_inodes, payload); + encode(wrlocked_inodes, payload); + encode(cap_exports, payload); + encode(client_map, payload, features); + encode(imported_caps, payload); + encode(strong_dirfrags, payload); + encode(dirfrag_bases, payload); + encode(weak, payload); + encode(weak_dirfrags, payload); + encode(weak_inodes, payload); + encode(strong_dentries, payload); + encode(authpinned_dentries, payload); + encode(xlocked_dentries, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(op, p); - ::decode(strong_inodes, p); - ::decode(inode_base, p); - ::decode(inode_locks, p); - ::decode(inode_scatterlocks, p); - ::decode(authpinned_inodes, p); - ::decode(frozen_authpin_inodes, p); - ::decode(xlocked_inodes, p); - ::decode(wrlocked_inodes, p); - ::decode(cap_exports, p); - ::decode(client_map, p); - ::decode(imported_caps, p); - ::decode(strong_dirfrags, p); - ::decode(dirfrag_bases, p); - ::decode(weak, p); - ::decode(weak_dirfrags, p); - ::decode(weak_inodes, p); - ::decode(strong_dentries, p); - ::decode(authpinned_dentries, p); - ::decode(xlocked_dentries, p); + using ceph::decode; + decode(op, p); + decode(strong_inodes, p); + decode(inode_base, p); + decode(inode_locks, p); + decode(inode_scatterlocks, p); + decode(authpinned_inodes, p); + decode(frozen_authpin_inodes, p); + decode(xlocked_inodes, p); + decode(wrlocked_inodes, p); + decode(cap_exports, p); + decode(client_map, p); + decode(imported_caps, p); + decode(strong_dirfrags, p); + decode(dirfrag_bases, p); + decode(weak, p); + decode(weak_dirfrags, p); + decode(weak_inodes, p); + decode(strong_dentries, p); + decode(authpinned_dentries, p); + decode(xlocked_dentries, p); } }; diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h index 351f025f686..3ea3683a25c 100644 --- a/src/messages/MMDSFindIno.h +++ b/src/messages/MMDSFindIno.h @@ -31,13 +31,14 @@ struct MMDSFindIno : public Message { } void encode_payload(uint64_t features) override { - ::encode(tid, payload); - ::encode(ino, payload); + using ceph::encode; + encode(tid, payload); + encode(ino, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(tid, p); - ::decode(ino, p); + decode(tid, p); + decode(ino, p); } }; diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h index 996d677789c..7560fd5de49 100644 --- a/src/messages/MMDSFindInoReply.h +++ b/src/messages/MMDSFindInoReply.h @@ -31,13 +31,14 @@ struct MMDSFindInoReply : public Message { } void encode_payload(uint64_t features) override { - ::encode(tid, payload); - ::encode(path, payload); + using ceph::encode; + encode(tid, payload); + encode(path, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(tid, p); - ::decode(path, p); + decode(tid, p); + decode(path, p); } }; diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h index 1d8e7e3114c..450bf29e91d 100644 --- a/src/messages/MMDSFragmentNotify.h +++ b/src/messages/MMDSFragmentNotify.h @@ -44,17 +44,18 @@ public: } void encode_payload(uint64_t features) override { - ::encode(ino, payload); - ::encode(basefrag, payload); - ::encode(bits, payload); - ::encode(basebl, payload); + using ceph::encode; + encode(ino, payload); + encode(basefrag, payload); + encode(bits, payload); + encode(basebl, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(ino, p); - ::decode(basefrag, p); - ::decode(bits, p); - ::decode(basebl, p); + decode(ino, p); + decode(basefrag, p); + decode(bits, p); + decode(basebl, p); } }; diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h index 128b1d1d034..212e09a585b 100644 --- a/src/messages/MMDSLoadTargets.h +++ b/src/messages/MMDSLoadTargets.h @@ -43,16 +43,18 @@ public: } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(global_id, p); - ::decode(targets, p); + decode(global_id, p); + decode(targets, p); } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(global_id, payload); - ::encode(targets, payload); + encode(global_id, payload); + encode(targets, payload); } }; diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h index 679f559bf8e..4f254d42d57 100644 --- a/src/messages/MMDSMap.h +++ b/src/messages/MMDSMap.h @@ -52,13 +52,14 @@ public: // marshalling void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(epoch, p); - ::decode(encoded, p); + decode(fsid, p); + decode(epoch, p); + decode(encoded, p); } void encode_payload(uint64_t features) override { - ::encode(fsid, payload); - ::encode(epoch, payload); + using ceph::encode; + encode(fsid, payload); + encode(epoch, payload); if ((features & CEPH_FEATURE_PGID64) == 0 || (features & CEPH_FEATURE_MDSENC) == 0 || (features & CEPH_FEATURE_MSG_ADDR2) == 0) { @@ -68,7 +69,7 @@ public: encoded.clear(); m.encode(encoded, features); } - ::encode(encoded, payload); + encode(encoded, payload); } }; diff --git a/src/messages/MMDSOpenIno.h b/src/messages/MMDSOpenIno.h index 667e6850300..8e8f1e1e2c2 100644 --- a/src/messages/MMDSOpenIno.h +++ b/src/messages/MMDSOpenIno.h @@ -35,13 +35,14 @@ struct MMDSOpenIno : public Message { } void encode_payload(uint64_t features) override { - ::encode(ino, payload); - ::encode(ancestors, payload); + using ceph::encode; + encode(ino, payload); + encode(ancestors, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(ino, p); - ::decode(ancestors, p); + decode(ino, p); + decode(ancestors, p); } }; diff --git a/src/messages/MMDSOpenInoReply.h b/src/messages/MMDSOpenInoReply.h index 0b80c0d0645..331eb537d75 100644 --- a/src/messages/MMDSOpenInoReply.h +++ b/src/messages/MMDSOpenInoReply.h @@ -36,17 +36,18 @@ struct MMDSOpenInoReply : public Message { } void encode_payload(uint64_t features) override { - ::encode(ino, payload); - ::encode(ancestors, payload); - ::encode(hint, payload); - ::encode(error, payload); + using ceph::encode; + encode(ino, payload); + encode(ancestors, payload); + encode(hint, payload); + encode(error, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(ino, p); - ::decode(ancestors, p); - ::decode(hint, p); - ::decode(error, p); + decode(ino, p); + decode(ancestors, p); + decode(hint, p); + decode(error, p); } }; diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h index baf581b4bd0..bf87e5f3a88 100644 --- a/src/messages/MMDSResolve.h +++ b/src/messages/MMDSResolve.h @@ -29,12 +29,14 @@ public: bool committing; slave_request() : committing(false) {} void encode(bufferlist &bl) const { - ::encode(inode_caps, bl); - ::encode(committing, bl); + using ceph::encode; + encode(inode_caps, bl); + encode(committing, bl); } void decode(bufferlist::iterator &bl) { - ::decode(inode_caps, bl); - ::decode(committing, bl); + using ceph::decode; + decode(inode_caps, bl); + decode(committing, bl); } }; WRITE_CLASS_ENCODER(slave_request) @@ -74,15 +76,17 @@ public: } void encode_payload(uint64_t features) override { - ::encode(subtrees, payload); - ::encode(ambiguous_imports, payload); - ::encode(slave_requests, payload); + using ceph::encode; + encode(subtrees, payload); + encode(ambiguous_imports, payload); + encode(slave_requests, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(subtrees, p); - ::decode(ambiguous_imports, p); - ::decode(slave_requests, p); + decode(subtrees, p); + decode(ambiguous_imports, p); + decode(slave_requests, p); } }; diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h index 98101fb70d7..2f3a655450b 100644 --- a/src/messages/MMDSResolveAck.h +++ b/src/messages/MMDSResolveAck.h @@ -46,13 +46,15 @@ public: } void encode_payload(uint64_t features) override { - ::encode(commit, payload); - ::encode(abort, payload); + using ceph::encode; + encode(commit, payload); + encode(abort, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); - ::decode(commit, p); - ::decode(abort, p); + decode(commit, p); + decode(abort, p); } }; diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h index 9e7510c9a6d..0ef692506be 100644 --- a/src/messages/MMDSSlaveRequest.h +++ b/src/messages/MMDSSlaveRequest.h @@ -161,41 +161,42 @@ private: public: void encode_payload(uint64_t features) override { - ::encode(reqid, payload); - ::encode(attempt, payload); - ::encode(op, payload); - ::encode(flags, payload); - ::encode(lock_type, payload); - ::encode(object_info, payload); - ::encode(authpins, payload); - ::encode(srcdnpath, payload); - ::encode(destdnpath, payload); - ::encode(witnesses, payload); - ::encode(op_stamp, payload); - ::encode(inode_export, payload); - ::encode(inode_export_v, payload); - ::encode(srcdn_auth, payload); - ::encode(srci_replica, payload); - ::encode(stray, payload); + using ceph::encode; + encode(reqid, payload); + encode(attempt, payload); + encode(op, payload); + encode(flags, payload); + encode(lock_type, payload); + encode(object_info, payload); + encode(authpins, payload); + encode(srcdnpath, payload); + encode(destdnpath, payload); + encode(witnesses, payload); + encode(op_stamp, payload); + encode(inode_export, payload); + encode(inode_export_v, payload); + encode(srcdn_auth, payload); + encode(srci_replica, payload); + encode(stray, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(reqid, p); - ::decode(attempt, p); - ::decode(op, p); - ::decode(flags, p); - ::decode(lock_type, p); - ::decode(object_info, p); - ::decode(authpins, p); - ::decode(srcdnpath, p); - ::decode(destdnpath, p); - ::decode(witnesses, p); - ::decode(op_stamp, p); - ::decode(inode_export, p); - ::decode(inode_export_v, p); - ::decode(srcdn_auth, p); - ::decode(srci_replica, p); - ::decode(stray, p); + decode(reqid, p); + decode(attempt, p); + decode(op, p); + decode(flags, p); + decode(lock_type, p); + decode(object_info, p); + decode(authpins, p); + decode(srcdnpath, p); + decode(destdnpath, p); + decode(witnesses, p); + decode(op_stamp, p); + decode(inode_export, p); + decode(inode_export_v, p); + decode(srcdn_auth, p); + decode(srci_replica, p); + decode(stray, p); } const char *get_type_name() const override { return "slave_request"; } diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h index b42a4ad6492..cf451cb5f8e 100644 --- a/src/messages/MMDSTableRequest.h +++ b/src/messages/MMDSTableRequest.h @@ -48,17 +48,18 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(table, p); - ::decode(op, p); - ::decode(reqid, p); - ::decode(bl, p); + decode(table, p); + decode(op, p); + decode(reqid, p); + decode(bl, p); } void encode_payload(uint64_t features) override { - ::encode(table, payload); - ::encode(op, payload); - ::encode(reqid, payload); - ::encode(bl, payload); + using ceph::encode; + encode(table, payload); + encode(op, payload); + encode(reqid, payload); + encode(bl, payload); } }; diff --git a/src/messages/MMgrBeacon.h b/src/messages/MMgrBeacon.h index 5def13c1491..54d569cba87 100644 --- a/src/messages/MMgrBeacon.h +++ b/src/messages/MMgrBeacon.h @@ -101,38 +101,39 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(server_addr, payload, features); - ::encode(gid, payload); - ::encode(available, payload); - ::encode(name, payload); - ::encode(fsid, payload); - ::encode(available_modules, payload); - ::encode(command_descs, payload); - ::encode(metadata, payload); - ::encode(services, payload); + encode(server_addr, payload, features); + encode(gid, payload); + encode(available, payload); + encode(name, payload); + encode(fsid, payload); + encode(available_modules, payload); + encode(command_descs, payload); + encode(metadata, payload); + encode(services, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(server_addr, p); - ::decode(gid, p); - ::decode(available, p); - ::decode(name, p); + decode(server_addr, p); + decode(gid, p); + decode(available, p); + decode(name, p); if (header.version >= 2) { - ::decode(fsid, p); + decode(fsid, p); } if (header.version >= 3) { - ::decode(available_modules, p); + decode(available_modules, p); } if (header.version >= 4) { - ::decode(command_descs, p); + decode(command_descs, p); } if (header.version >= 5) { - ::decode(metadata, p); + decode(metadata, p); } if (header.version >= 6) { - ::decode(services, p); + decode(services, p); } } }; diff --git a/src/messages/MMgrConfigure.h b/src/messages/MMgrConfigure.h index 3a963665cf1..399cc5d2550 100644 --- a/src/messages/MMgrConfigure.h +++ b/src/messages/MMgrConfigure.h @@ -35,15 +35,16 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(stats_period, p); + decode(stats_period, p); if (header.version >= 2) { - ::decode(stats_threshold, p); + decode(stats_threshold, p); } } void encode_payload(uint64_t features) override { - ::encode(stats_period, payload); - ::encode(stats_threshold, payload); + using ceph::encode; + encode(stats_period, payload); + encode(stats_threshold, payload); } const char *get_type_name() const override { return "mgrconfigure"; } diff --git a/src/messages/MMgrDigest.h b/src/messages/MMgrDigest.h index a8e5289d27d..c661519b185 100644 --- a/src/messages/MMgrDigest.h +++ b/src/messages/MMgrDigest.h @@ -37,12 +37,13 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(mon_status_json, p); - ::decode(health_json, p); + decode(mon_status_json, p); + decode(health_json, p); } void encode_payload(uint64_t features) override { - ::encode(mon_status_json, payload); - ::encode(health_json, payload); + using ceph::encode; + encode(mon_status_json, payload); + encode(health_json, payload); } private: diff --git a/src/messages/MMgrMap.h b/src/messages/MMgrMap.h index ddaa96a3a51..965e9e57326 100644 --- a/src/messages/MMgrMap.h +++ b/src/messages/MMgrMap.h @@ -44,10 +44,11 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(map, p); + decode(map, p); } void encode_payload(uint64_t features) override { - ::encode(map, payload, features); + using ceph::encode; + encode(map, payload, features); } }; diff --git a/src/messages/MMgrOpen.h b/src/messages/MMgrOpen.h index 5db75e3f195..42fedee8010 100644 --- a/src/messages/MMgrOpen.h +++ b/src/messages/MMgrOpen.h @@ -34,24 +34,25 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(daemon_name, p); + decode(daemon_name, p); if (header.version >= 2) { - ::decode(service_name, p); - ::decode(service_daemon, p); + decode(service_name, p); + decode(service_daemon, p); if (service_daemon) { - ::decode(daemon_metadata, p); - ::decode(daemon_status, p); + decode(daemon_metadata, p); + decode(daemon_status, p); } } } void encode_payload(uint64_t features) override { - ::encode(daemon_name, payload); - ::encode(service_name, payload); - ::encode(service_daemon, payload); + using ceph::encode; + encode(daemon_name, payload); + encode(service_name, payload); + encode(service_daemon, payload); if (service_daemon) { - ::encode(daemon_metadata, payload); - ::encode(daemon_status, payload); + encode(daemon_metadata, payload); + encode(daemon_status, payload); } } diff --git a/src/messages/MMgrReport.h b/src/messages/MMgrReport.h index f6af6dfb86a..331fd073c09 100644 --- a/src/messages/MMgrReport.h +++ b/src/messages/MMgrReport.h @@ -41,24 +41,24 @@ public: // encoding here, we could rely on the MgrReport // verisoning instead. ENCODE_START(2, 1, bl); - ::encode(path, bl); - ::encode(description, bl); - ::encode(nick, bl); + encode(path, bl); + encode(description, bl); + encode(nick, bl); static_assert(sizeof(type) == 1, "perfcounter_type_d must be one byte"); - ::encode((uint8_t)type, bl); - ::encode(priority, bl); + encode((uint8_t)type, bl); + encode(priority, bl); ENCODE_FINISH(bl); } void decode(bufferlist::iterator &p) { DECODE_START(2, p); - ::decode(path, p); - ::decode(description, p); - ::decode(nick, p); - ::decode((uint8_t&)type, p); + decode(path, p); + decode(description, p); + decode(nick, p); + decode((uint8_t&)type, p); if (struct_v >= 2) { - ::decode(priority, p); + decode(priority, p); } DECODE_FINISH(p); } @@ -98,28 +98,29 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(daemon_name, p); - ::decode(declare_types, p); - ::decode(packed, p); + decode(daemon_name, p); + decode(declare_types, p); + decode(packed, p); if (header.version >= 2) - ::decode(undeclare_types, p); + decode(undeclare_types, p); if (header.version >= 3) { - ::decode(service_name, p); - ::decode(daemon_status, p); + decode(service_name, p); + decode(daemon_status, p); } if (header.version >= 5) { - ::decode(osd_health_metrics, p); + decode(osd_health_metrics, p); } } void encode_payload(uint64_t features) override { - ::encode(daemon_name, payload); - ::encode(declare_types, payload); - ::encode(packed, payload); - ::encode(undeclare_types, payload); - ::encode(service_name, payload); - ::encode(daemon_status, payload); - ::encode(osd_health_metrics, payload); + using ceph::encode; + encode(daemon_name, payload); + encode(declare_types, payload); + encode(packed, payload); + encode(undeclare_types, payload); + encode(service_name, payload); + encode(daemon_status, payload); + encode(osd_health_metrics, payload); } const char *get_type_name() const override { return "mgrreport"; } diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h index c6764475dcd..a0b263c8d49 100644 --- a/src/messages/MMonCommand.h +++ b/src/messages/MMonCommand.h @@ -46,15 +46,16 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(cmd, payload); + encode(fsid, payload); + encode(cmd, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(cmd, p); + decode(fsid, p); + decode(cmd, p); } }; diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h index 2c07b5fe722..405f81d5f90 100644 --- a/src/messages/MMonCommandAck.h +++ b/src/messages/MMonCommandAck.h @@ -37,17 +37,18 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(r, payload); - ::encode(rs, payload); - ::encode(cmd, payload); + encode(r, payload); + encode(rs, payload); + encode(cmd, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(r, p); - ::decode(rs, p); - ::decode(cmd, p); + decode(r, p); + decode(rs, p); + decode(cmd, p); } }; diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h index c9b87c451ec..530e13f60f6 100644 --- a/src/messages/MMonElection.h +++ b/src/messages/MMonElection.h @@ -76,6 +76,7 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; if (monmap_bl.length() && (features != CEPH_FEATURES_ALL)) { // reencode old-format monmap MonMap t; @@ -84,36 +85,36 @@ public: t.encode(monmap_bl, features); } - ::encode(fsid, payload); - ::encode(op, payload); - ::encode(epoch, payload); - ::encode(monmap_bl, payload); - ::encode(quorum, payload); - ::encode(quorum_features, payload); - ::encode((version_t)0, payload); // defunct - ::encode((version_t)0, payload); // defunct - ::encode(sharing_bl, payload); - ::encode(mon_features, payload); - ::encode(metadata, payload); + encode(fsid, payload); + encode(op, payload); + encode(epoch, payload); + encode(monmap_bl, payload); + encode(quorum, payload); + encode(quorum_features, payload); + encode((version_t)0, payload); // defunct + encode((version_t)0, payload); // defunct + encode(sharing_bl, payload); + encode(mon_features, payload); + encode(metadata, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(op, p); - ::decode(epoch, p); - ::decode(monmap_bl, p); - ::decode(quorum, p); - ::decode(quorum_features, p); + decode(fsid, p); + decode(op, p); + decode(epoch, p); + decode(monmap_bl, p); + decode(quorum, p); + decode(quorum_features, p); { version_t v; // defunct fields from old encoding - ::decode(v, p); - ::decode(v, p); + decode(v, p); + decode(v, p); } - ::decode(sharing_bl, p); + decode(sharing_bl, p); if (header.version >= 6) - ::decode(mon_features, p); + decode(mon_features, p); if (header.version >= 7) - ::decode(metadata, p); + decode(metadata, p); } }; diff --git a/src/messages/MMonGetOSDMap.h b/src/messages/MMonGetOSDMap.h index de10c7a87f8..532a37776d1 100644 --- a/src/messages/MMonGetOSDMap.h +++ b/src/messages/MMonGetOSDMap.h @@ -68,19 +68,21 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(full_first, payload); - ::encode(full_last, payload); - ::encode(inc_first, payload); - ::encode(inc_last, payload); + encode(full_first, payload); + encode(full_last, payload); + encode(inc_first, payload); + encode(inc_last, payload); } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(full_first, p); - ::decode(full_last, p); - ::decode(inc_first, p); - ::decode(inc_last, p); + decode(full_first, p); + decode(full_last, p); + decode(inc_first, p); + decode(inc_last, p); } }; diff --git a/src/messages/MMonGetVersion.h b/src/messages/MMonGetVersion.h index ddf58dc6d44..5ee28d6053a 100644 --- a/src/messages/MMonGetVersion.h +++ b/src/messages/MMonGetVersion.h @@ -38,14 +38,15 @@ public: } void encode_payload(uint64_t features) override { - ::encode(handle, payload); - ::encode(what, payload); + using ceph::encode; + encode(handle, payload); + encode(what, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(handle, p); - ::decode(what, p); + decode(handle, p); + decode(what, p); } ceph_tid_t handle = 0; diff --git a/src/messages/MMonGetVersionReply.h b/src/messages/MMonGetVersionReply.h index 4df114d3c0e..cc9fac0e180 100644 --- a/src/messages/MMonGetVersionReply.h +++ b/src/messages/MMonGetVersionReply.h @@ -40,17 +40,18 @@ public: } void encode_payload(uint64_t features) override { - ::encode(handle, payload); - ::encode(version, payload); - ::encode(oldest_version, payload); + using ceph::encode; + encode(handle, payload); + encode(version, payload); + encode(oldest_version, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(handle, p); - ::decode(version, p); + decode(handle, p); + decode(version, p); if (header.version >= 2) - ::decode(oldest_version, p); + decode(oldest_version, p); } ceph_tid_t handle = 0; diff --git a/src/messages/MMonGlobalID.h b/src/messages/MMonGlobalID.h index 99f466dc4a3..c92ea1d985e 100644 --- a/src/messages/MMonGlobalID.h +++ b/src/messages/MMonGlobalID.h @@ -32,11 +32,12 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(old_max_id, p); + decode(old_max_id, p); } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(old_max_id, payload); + encode(old_max_id, payload); } }; diff --git a/src/messages/MMonHealthChecks.h b/src/messages/MMonHealthChecks.h index 6b66847633f..cef94294be0 100644 --- a/src/messages/MMonHealthChecks.h +++ b/src/messages/MMonHealthChecks.h @@ -34,12 +34,13 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(health_checks, p); + decode(health_checks, p); } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(health_checks, payload); + encode(health_checks, payload); } }; diff --git a/src/messages/MMonJoin.h b/src/messages/MMonJoin.h index 9f9331a7cd3..ebb407c0af3 100644 --- a/src/messages/MMonJoin.h +++ b/src/messages/MMonJoin.h @@ -42,17 +42,18 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(name, payload); - ::encode(addr, payload, features); + encode(fsid, payload); + encode(name, payload); + encode(addr, payload, features); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(name, p); - ::decode(addr, p); + decode(fsid, p); + decode(name, p); + decode(addr, p); } }; diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h index 831b1a1fbb1..102429a44a9 100644 --- a/src/messages/MMonMap.h +++ b/src/messages/MMonMap.h @@ -44,11 +44,12 @@ public: t.encode(monmapbl, features); } - ::encode(monmapbl, payload); + using ceph::encode; + encode(monmapbl, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(monmapbl, p); + decode(monmapbl, p); } }; diff --git a/src/messages/MMonMetadata.h b/src/messages/MMonMetadata.h index 3b084d92e99..68acb26e631 100644 --- a/src/messages/MMonMetadata.h +++ b/src/messages/MMonMetadata.h @@ -40,12 +40,13 @@ public: } void encode_payload(uint64_t features) override { - ::encode(data, payload); + using ceph::encode; + encode(data, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(data, p); + decode(data, p); } }; diff --git a/src/messages/MMonMgrReport.h b/src/messages/MMonMgrReport.h index eef0966f15c..72bbfe0a72a 100644 --- a/src/messages/MMonMgrReport.h +++ b/src/messages/MMonMgrReport.h @@ -44,15 +44,16 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(health_checks, payload); - ::encode(service_map_bl, payload); + encode(health_checks, payload); + encode(service_map_bl, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(health_checks, p); - ::decode(service_map_bl, p); + decode(health_checks, p); + decode(service_map_bl, p); } }; diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h index 8a5e4f93416..36bb3b086b2 100644 --- a/src/messages/MMonPaxos.h +++ b/src/messages/MMonPaxos.h @@ -92,37 +92,38 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; header.version = HEAD_VERSION; - ::encode(epoch, payload); - ::encode(op, payload); - ::encode(first_committed, payload); - ::encode(last_committed, payload); - ::encode(pn_from, payload); - ::encode(pn, payload); - ::encode(uncommitted_pn, payload); - ::encode(lease_timestamp, payload); - ::encode(sent_timestamp, payload); - ::encode(latest_version, payload); - ::encode(latest_value, payload); - ::encode(values, payload); - ::encode(feature_map, payload); + encode(epoch, payload); + encode(op, payload); + encode(first_committed, payload); + encode(last_committed, payload); + encode(pn_from, payload); + encode(pn, payload); + encode(uncommitted_pn, payload); + encode(lease_timestamp, payload); + encode(sent_timestamp, payload); + encode(latest_version, payload); + encode(latest_value, payload); + encode(values, payload); + encode(feature_map, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(op, p); - ::decode(first_committed, p); - ::decode(last_committed, p); - ::decode(pn_from, p); - ::decode(pn, p); - ::decode(uncommitted_pn, p); - ::decode(lease_timestamp, p); - ::decode(sent_timestamp, p); - ::decode(latest_version, p); - ::decode(latest_value, p); - ::decode(values, p); + decode(epoch, p); + decode(op, p); + decode(first_committed, p); + decode(last_committed, p); + decode(pn_from, p); + decode(pn, p); + decode(uncommitted_pn, p); + decode(lease_timestamp, p); + decode(sent_timestamp, p); + decode(latest_version, p); + decode(latest_value, p); + decode(values, p); if (header.version >= 4) { - ::decode(feature_map, p); + decode(feature_map, p); } } }; diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h index c98fc3a7594..d372501ff9a 100644 --- a/src/messages/MMonProbe.h +++ b/src/messages/MMonProbe.h @@ -90,6 +90,7 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; if (monmap_bl.length() && ((features & CEPH_FEATURE_MONENC) == 0 || (features & CEPH_FEATURE_MSG_ADDR2) == 0)) { @@ -100,28 +101,28 @@ public: t.encode(monmap_bl, features); } - ::encode(fsid, payload); - ::encode(op, payload); - ::encode(name, payload); - ::encode(quorum, payload); - ::encode(monmap_bl, payload); - ::encode(has_ever_joined, payload); - ::encode(paxos_first_version, payload); - ::encode(paxos_last_version, payload); - ::encode(required_features, payload); + encode(fsid, payload); + encode(op, payload); + encode(name, payload); + encode(quorum, payload); + encode(monmap_bl, payload); + encode(has_ever_joined, payload); + encode(paxos_first_version, payload); + encode(paxos_last_version, payload); + encode(required_features, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(op, p); - ::decode(name, p); - ::decode(quorum, p); - ::decode(monmap_bl, p); - ::decode(has_ever_joined, p); - ::decode(paxos_first_version, p); - ::decode(paxos_last_version, p); + decode(fsid, p); + decode(op, p); + decode(name, p); + decode(quorum, p); + decode(monmap_bl, p); + decode(has_ever_joined, p); + decode(paxos_first_version, p); + decode(paxos_last_version, p); if (header.version >= 6) - ::decode(required_features, p); + decode(required_features, p); else required_features = 0; } diff --git a/src/messages/MMonQuorumService.h b/src/messages/MMonQuorumService.h index ff77b468c74..6810707dfc9 100644 --- a/src/messages/MMonQuorumService.h +++ b/src/messages/MMonQuorumService.h @@ -49,13 +49,14 @@ public: } void service_encode() { - ::encode(epoch, payload); - ::encode(round, payload); + using ceph::encode; + encode(epoch, payload); + encode(round, payload); } void service_decode(bufferlist::iterator &p) { - ::decode(epoch, p); - ::decode(round, p); + decode(epoch, p); + decode(round, p); } void encode_payload(uint64_t features) override { diff --git a/src/messages/MMonScrub.h b/src/messages/MMonScrub.h index b7424ea07a5..883047ef02f 100644 --- a/src/messages/MMonScrub.h +++ b/src/messages/MMonScrub.h @@ -64,23 +64,24 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; uint8_t o = op; - ::encode(o, payload); - ::encode(version, payload); - ::encode(result, payload); - ::encode(num_keys, payload); - ::encode(key, payload); + encode(o, payload); + encode(version, payload); + encode(result, payload); + encode(num_keys, payload); + encode(key, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); uint8_t o; - ::decode(o, p); + decode(o, p); op = (op_type_t)o; - ::decode(version, p); - ::decode(result, p); - ::decode(num_keys, p); - ::decode(key, p); + decode(version, p); + decode(result, p); + decode(num_keys, p); + decode(key, p); } }; diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h index 1fee9bb379e..74c2a87ea68 100644 --- a/src/messages/MMonSubscribe.h +++ b/src/messages/MMonSubscribe.h @@ -54,7 +54,7 @@ public: bufferlist::iterator p = payload.begin(); if (header.version < 2) { map oldwhat; - ::decode(oldwhat, p); + decode(oldwhat, p); what.clear(); for (map::iterator q = oldwhat.begin(); q != oldwhat.end(); @@ -68,12 +68,13 @@ public: what[q->first].flags |= CEPH_SUBSCRIBE_ONETIME; } } else { - ::decode(what, p); + decode(what, p); } } void encode_payload(uint64_t features) override { + using ceph::encode; if (features & CEPH_FEATURE_SUBSCRIBE2) { - ::encode(what, payload); + encode(what, payload); header.version = HEAD_VERSION; } else { header.version = 0; @@ -88,7 +89,7 @@ public: oldwhat[q->first].have = 0; oldwhat[q->first].onetime = q->second.flags & CEPH_SUBSCRIBE_ONETIME; } - ::encode(oldwhat, payload); + encode(oldwhat, payload); } } }; diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h index 148d90db75d..6c36626a1f6 100644 --- a/src/messages/MMonSubscribeAck.h +++ b/src/messages/MMonSubscribeAck.h @@ -38,12 +38,13 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(interval, p); - ::decode(fsid, p); + decode(interval, p); + decode(fsid, p); } void encode_payload(uint64_t features) override { - ::encode(interval, payload); - ::encode(fsid, payload); + using ceph::encode; + encode(interval, payload); + encode(fsid, payload); } }; diff --git a/src/messages/MMonSync.h b/src/messages/MMonSync.h index 2b383820b47..0c9accaa60e 100644 --- a/src/messages/MMonSync.h +++ b/src/messages/MMonSync.h @@ -87,24 +87,25 @@ public: } void encode_payload(uint64_t features) override { - ::encode(op, payload); - ::encode(cookie, payload); - ::encode(last_committed, payload); - ::encode(last_key.first, payload); - ::encode(last_key.second, payload); - ::encode(chunk_bl, payload); - ::encode(reply_to, payload, features); + using ceph::encode; + encode(op, payload); + encode(cookie, payload); + encode(last_committed, payload); + encode(last_key.first, payload); + encode(last_key.second, payload); + encode(chunk_bl, payload); + encode(reply_to, payload, features); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(op, p); - ::decode(cookie, p); - ::decode(last_committed, p); - ::decode(last_key.first, p); - ::decode(last_key.second, p); - ::decode(chunk_bl, p); - ::decode(reply_to, p); + decode(op, p); + decode(cookie, p); + decode(last_committed, p); + decode(last_key.first, p); + decode(last_key.second, p); + decode(chunk_bl, p); + decode(reply_to, p); } }; diff --git a/src/messages/MNop.h b/src/messages/MNop.h index f820abbee1b..9c28104b13c 100644 --- a/src/messages/MNop.h +++ b/src/messages/MNop.h @@ -36,12 +36,13 @@ public: ~MNop() {} void encode_payload(uint64_t _features) { - ::encode(tag, payload); + using ceph::encode; + encode(tag, payload); } void decode_payload() { bufferlist::iterator p = payload.begin(); - ::decode(tag, p); + decode(tag, p); } const char *get_type_name() const { return "MNop"; } diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h index 82b52e9cc14..7a77e7f3868 100644 --- a/src/messages/MOSDAlive.h +++ b/src/messages/MOSDAlive.h @@ -31,12 +31,13 @@ private: public: void encode_payload(uint64_t features) override { paxos_encode(); - ::encode(want, payload); + using ceph::encode; + encode(want, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(want, p); + decode(want, p); } const char *get_type_name() const override { return "osd_alive"; } diff --git a/src/messages/MOSDBackoff.h b/src/messages/MOSDBackoff.h index 5b12884524a..c502fdccf8a 100644 --- a/src/messages/MOSDBackoff.h +++ b/src/messages/MOSDBackoff.h @@ -50,22 +50,23 @@ public: end(end_) { } void encode_payload(uint64_t features) override { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(op, payload); - ::encode(id, payload); - ::encode(begin, payload); - ::encode(end, payload); + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(op, payload); + encode(id, payload); + encode(begin, payload); + encode(end, payload); } void decode_payload() override { auto p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(op, p); - ::decode(id, p); - ::decode(begin, p); - ::decode(end, p); + decode(pgid, p); + decode(map_epoch, p); + decode(op, p); + decode(id, p); + decode(begin, p); + decode(end, p); } const char *get_type_name() const override { return "osd_backoff"; } diff --git a/src/messages/MOSDBeacon.h b/src/messages/MOSDBeacon.h index b8b083899f4..be0209b9bd9 100644 --- a/src/messages/MOSDBeacon.h +++ b/src/messages/MOSDBeacon.h @@ -16,15 +16,16 @@ public: min_last_epoch_clean(min_lec) {} void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(pgs, payload); - ::encode(min_last_epoch_clean, payload); + encode(pgs, payload); + encode(min_last_epoch_clean, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(pgs, p); - ::decode(min_last_epoch_clean, p); + decode(pgs, p); + decode(min_last_epoch_clean, p); } const char *get_type_name() const override { return "osd_beacon"; } void print(ostream &out) const { diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h index 66f5bf079b6..ec25692f77e 100644 --- a/src/messages/MOSDBoot.h +++ b/src/messages/MOSDBoot.h @@ -63,25 +63,26 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(sb, payload); - ::encode(hb_back_addr, payload, features); - ::encode(cluster_addr, payload, features); - ::encode(boot_epoch, payload); - ::encode(hb_front_addr, payload, features); - ::encode(metadata, payload); - ::encode(osd_features, payload); + encode(sb, payload); + encode(hb_back_addr, payload, features); + encode(cluster_addr, payload, features); + encode(boot_epoch, payload); + encode(hb_front_addr, payload, features); + encode(metadata, payload); + encode(osd_features, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(sb, p); - ::decode(hb_back_addr, p); - ::decode(cluster_addr, p); - ::decode(boot_epoch, p); - ::decode(hb_front_addr, p); - ::decode(metadata, p); - ::decode(osd_features, p); + decode(sb, p); + decode(hb_back_addr, p); + decode(cluster_addr, p); + decode(boot_epoch, p); + decode(hb_front_addr, p); + decode(metadata, p); + decode(osd_features, p); } }; diff --git a/src/messages/MOSDECSubOpRead.h b/src/messages/MOSDECSubOpRead.h index 48a283c2060..b5879dc510d 100644 --- a/src/messages/MOSDECSubOpRead.h +++ b/src/messages/MOSDECSubOpRead.h @@ -46,11 +46,11 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(op, p); + decode(pgid, p); + decode(map_epoch, p); + decode(op, p); if (header.version >= 3) { - ::decode(min_epoch, p); + decode(min_epoch, p); decode_trace(p); } else { min_epoch = map_epoch; @@ -58,10 +58,11 @@ public: } void encode_payload(uint64_t features) override { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(op, payload, features); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(op, payload, features); + encode(min_epoch, payload); encode_trace(payload, features); } diff --git a/src/messages/MOSDECSubOpReadReply.h b/src/messages/MOSDECSubOpReadReply.h index 4cc3547400b..c013ba14cec 100644 --- a/src/messages/MOSDECSubOpReadReply.h +++ b/src/messages/MOSDECSubOpReadReply.h @@ -46,11 +46,11 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(op, p); + decode(pgid, p); + decode(map_epoch, p); + decode(op, p); if (header.version >= 2) { - ::decode(min_epoch, p); + decode(min_epoch, p); decode_trace(p); } else { min_epoch = map_epoch; @@ -58,10 +58,11 @@ public: } void encode_payload(uint64_t features) override { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(op, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(op, payload); + encode(min_epoch, payload); encode_trace(payload, features); } diff --git a/src/messages/MOSDECSubOpWrite.h b/src/messages/MOSDECSubOpWrite.h index b1e6b8c361f..e5207d00589 100644 --- a/src/messages/MOSDECSubOpWrite.h +++ b/src/messages/MOSDECSubOpWrite.h @@ -50,11 +50,11 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(op, p); + decode(pgid, p); + decode(map_epoch, p); + decode(op, p); if (header.version >= 2) { - ::decode(min_epoch, p); + decode(min_epoch, p); decode_trace(p); } else { min_epoch = map_epoch; @@ -62,10 +62,11 @@ public: } void encode_payload(uint64_t features) override { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(op, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(op, payload); + encode(min_epoch, payload); encode_trace(payload, features); } diff --git a/src/messages/MOSDECSubOpWriteReply.h b/src/messages/MOSDECSubOpWriteReply.h index e7ca5233bed..97ade07199b 100644 --- a/src/messages/MOSDECSubOpWriteReply.h +++ b/src/messages/MOSDECSubOpWriteReply.h @@ -46,11 +46,11 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(op, p); + decode(pgid, p); + decode(map_epoch, p); + decode(op, p); if (header.version >= 2) { - ::decode(min_epoch, p); + decode(min_epoch, p); decode_trace(p); } else { min_epoch = map_epoch; @@ -58,10 +58,11 @@ public: } void encode_payload(uint64_t features) override { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(op, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(op, payload); + encode(min_epoch, payload); encode_trace(payload, features); } diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h index 793b4eeb5c6..dceee4055f5 100644 --- a/src/messages/MOSDFailure.h +++ b/src/messages/MOSDFailure.h @@ -65,20 +65,21 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(target_osd, p); - ::decode(epoch, p); - ::decode(flags, p); - ::decode(failed_for, p); + decode(fsid, p); + decode(target_osd, p); + decode(epoch, p); + decode(flags, p); + decode(failed_for, p); } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(target_osd, payload, features); - ::encode(epoch, payload); - ::encode(flags, payload); - ::encode(failed_for, payload); + encode(fsid, payload); + encode(target_osd, payload, features); + encode(epoch, payload); + encode(flags, payload); + encode(failed_for, payload); } const char *get_type_name() const override { return "osd_failure"; } diff --git a/src/messages/MOSDForceRecovery.h b/src/messages/MOSDForceRecovery.h index 44c221f56ea..a36fd921d5b 100644 --- a/src/messages/MOSDForceRecovery.h +++ b/src/messages/MOSDForceRecovery.h @@ -68,15 +68,16 @@ public: } void encode_payload(uint64_t features) { - ::encode(fsid, payload); - ::encode(forced_pgs, payload); - ::encode(options, payload); + using ceph::encode; + encode(fsid, payload); + encode(forced_pgs, payload); + encode(options, payload); } void decode_payload() { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(forced_pgs, p); - ::decode(options, p); + decode(fsid, p); + decode(forced_pgs, p); + decode(options, p); } }; diff --git a/src/messages/MOSDFull.h b/src/messages/MOSDFull.h index 5fcd3c8b37d..19eb535c6f1 100644 --- a/src/messages/MOSDFull.h +++ b/src/messages/MOSDFull.h @@ -27,15 +27,16 @@ public: public: void encode_payload(uint64_t features) { + using ceph::encode; paxos_encode(); - ::encode(map_epoch, payload); - ::encode(state, payload); + encode(map_epoch, payload); + encode(state, payload); } void decode_payload() { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(map_epoch, p); - ::decode(state, p); + decode(map_epoch, p); + decode(state, p); } const char *get_type_name() const { return "osd_full"; } diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h index 96b40012e14..beaef358c81 100644 --- a/src/messages/MOSDMap.h +++ b/src/messages/MOSDMap.h @@ -74,24 +74,25 @@ public: // marshalling void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(incremental_maps, p); - ::decode(maps, p); + decode(fsid, p); + decode(incremental_maps, p); + decode(maps, p); if (header.version >= 2) { - ::decode(oldest_map, p); - ::decode(newest_map, p); + decode(oldest_map, p); + decode(newest_map, p); } else { oldest_map = 0; newest_map = 0; } if (header.version >= 4) { - ::decode(gap_removed_snaps, p); + decode(gap_removed_snaps, p); } } void encode_payload(uint64_t features) override { + using ceph::encode; header.version = HEAD_VERSION; header.compat_version = COMPAT_VERSION; - ::encode(fsid, payload); + encode(fsid, payload); if ((features & CEPH_FEATURE_PGID64) == 0 || (features & CEPH_FEATURE_PGPOOL3) == 0 || (features & CEPH_FEATURE_OSDENC) == 0 || @@ -143,14 +144,14 @@ public: m.encode(p->second, features | CEPH_FEATURE_RESERVED); } } - ::encode(incremental_maps, payload); - ::encode(maps, payload); + encode(incremental_maps, payload); + encode(maps, payload); if (header.version >= 2) { - ::encode(oldest_map, payload); - ::encode(newest_map, payload); + encode(oldest_map, payload); + encode(newest_map, payload); } if (header.version >= 4) { - ::encode(gap_removed_snaps, payload); + encode(gap_removed_snaps, payload); } } diff --git a/src/messages/MOSDMarkMeDown.h b/src/messages/MOSDMarkMeDown.h index 0b6cb1af853..ce8e42f5e17 100644 --- a/src/messages/MOSDMarkMeDown.h +++ b/src/messages/MOSDMarkMeDown.h @@ -46,18 +46,19 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(target_osd, p); - ::decode(epoch, p); - ::decode(request_ack, p); + decode(fsid, p); + decode(target_osd, p); + decode(epoch, p); + decode(request_ack, p); } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(target_osd, payload, features); - ::encode(epoch, payload); - ::encode(request_ack, payload); + encode(fsid, payload); + encode(target_osd, payload, features); + encode(epoch, payload); + encode(request_ack, payload); } const char *get_type_name() const override { return "MOSDMarkMeDown"; } diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index 1c16f2a636c..6526ea2c4f0 100644 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -253,6 +253,7 @@ public: // marshalling void encode_payload(uint64_t features) override { + using ceph::encode; if( false == bdata_encode ) { OSDOp::merge_osd_op_vector_in_data(ops, data); bdata_encode = true; @@ -283,86 +284,86 @@ struct ceph_osd_request_head { #endif header.version = 1; - ::encode(client_inc, payload); + encode(client_inc, payload); __u32 su = 0; - ::encode(get_raw_pg(), payload); - ::encode(su, payload); + encode(get_raw_pg(), payload); + encode(su, payload); - ::encode(osdmap_epoch, payload); - ::encode(flags, payload); - ::encode(mtime, payload); - ::encode(eversion_t(), payload); // reassert_version + encode(osdmap_epoch, payload); + encode(flags, payload); + encode(mtime, payload); + encode(eversion_t(), payload); // reassert_version __u32 oid_len = hobj.oid.name.length(); - ::encode(oid_len, payload); - ::encode(hobj.snap, payload); - ::encode(snap_seq, payload); + encode(oid_len, payload); + encode(hobj.snap, payload); + encode(snap_seq, payload); __u32 num_snaps = snaps.size(); - ::encode(num_snaps, payload); + encode(num_snaps, payload); //::encode(ops, payload); __u16 num_ops = ops.size(); - ::encode(num_ops, payload); + encode(num_ops, payload); for (unsigned i = 0; i < ops.size(); i++) - ::encode(ops[i].op, payload); + encode(ops[i].op, payload); - ::encode_nohead(hobj.oid.name, payload); - ::encode_nohead(snaps, payload); + encode_nohead(hobj.oid.name, payload); + encode_nohead(snaps, payload); } else if ((features & CEPH_FEATURE_NEW_OSDOP_ENCODING) == 0) { header.version = 6; - ::encode(client_inc, payload); - ::encode(osdmap_epoch, payload); - ::encode(flags, payload); - ::encode(mtime, payload); - ::encode(eversion_t(), payload); // reassert_version - ::encode(get_object_locator(), payload); - ::encode(get_raw_pg(), payload); + encode(client_inc, payload); + encode(osdmap_epoch, payload); + encode(flags, payload); + encode(mtime, payload); + encode(eversion_t(), payload); // reassert_version + encode(get_object_locator(), payload); + encode(get_raw_pg(), payload); - ::encode(hobj.oid, payload); + encode(hobj.oid, payload); __u16 num_ops = ops.size(); - ::encode(num_ops, payload); + encode(num_ops, payload); for (unsigned i = 0; i < ops.size(); i++) - ::encode(ops[i].op, payload); + encode(ops[i].op, payload); - ::encode(hobj.snap, payload); - ::encode(snap_seq, payload); - ::encode(snaps, payload); + encode(hobj.snap, payload); + encode(snap_seq, payload); + encode(snaps, payload); - ::encode(retry_attempt, payload); - ::encode(features, payload); + encode(retry_attempt, payload); + encode(features, payload); if (reqid.name != entity_name_t() || reqid.tid != 0) { - ::encode(reqid, payload); + encode(reqid, payload); } else { // don't include client_inc in the reqid for the legacy v6 // encoding or else we'll confuse older peers. - ::encode(osd_reqid_t(), payload); + encode(osd_reqid_t(), payload); } } else if (!HAVE_FEATURE(features, RESEND_ON_SPLIT)) { // reordered, v7 message encoding header.version = 7; - ::encode(get_raw_pg(), payload); - ::encode(osdmap_epoch, payload); - ::encode(flags, payload); - ::encode(eversion_t(), payload); // reassert_version - ::encode(reqid, payload); - ::encode(client_inc, payload); - ::encode(mtime, payload); - ::encode(get_object_locator(), payload); - ::encode(hobj.oid, payload); + encode(get_raw_pg(), payload); + encode(osdmap_epoch, payload); + encode(flags, payload); + encode(eversion_t(), payload); // reassert_version + encode(reqid, payload); + encode(client_inc, payload); + encode(mtime, payload); + encode(get_object_locator(), payload); + encode(hobj.oid, payload); __u16 num_ops = ops.size(); - ::encode(num_ops, payload); + encode(num_ops, payload); for (unsigned i = 0; i < ops.size(); i++) - ::encode(ops[i].op, payload); + encode(ops[i].op, payload); - ::encode(hobj.snap, payload); - ::encode(snap_seq, payload); - ::encode(snaps, payload); + encode(hobj.snap, payload); + encode(snap_seq, payload); + encode(snaps, payload); - ::encode(retry_attempt, payload); - ::encode(features, payload); + encode(retry_attempt, payload); + encode(features, payload); } else { // v9 encoding for dmclock use, otherwise v8. // v8 encoding with hobject_t hash separate from pgid, no @@ -373,34 +374,34 @@ struct ceph_osd_request_head { header.version = 8; } - ::encode(pgid, payload); - ::encode(hobj.get_hash(), payload); - ::encode(osdmap_epoch, payload); - ::encode(flags, payload); - ::encode(reqid, payload); + encode(pgid, payload); + encode(hobj.get_hash(), payload); + encode(osdmap_epoch, payload); + encode(flags, payload); + encode(reqid, payload); if (header.version >= 9) { - ::encode(qos_params, payload); + encode(qos_params, payload); } encode_trace(payload, features); // -- above decoded up front; below decoded post-dispatch thread -- - ::encode(client_inc, payload); - ::encode(mtime, payload); - ::encode(get_object_locator(), payload); - ::encode(hobj.oid, payload); + encode(client_inc, payload); + encode(mtime, payload); + encode(get_object_locator(), payload); + encode(hobj.oid, payload); __u16 num_ops = ops.size(); - ::encode(num_ops, payload); + encode(num_ops, payload); for (unsigned i = 0; i < ops.size(); i++) - ::encode(ops[i].op, payload); + encode(ops[i].op, payload); - ::encode(hobj.snap, payload); - ::encode(snap_seq, payload); - ::encode(snaps, payload); + encode(hobj.snap, payload); + encode(snap_seq, payload); + encode(snaps, payload); - ::encode(retry_attempt, payload); - ::encode(features, payload); + encode(retry_attempt, payload); + encode(features, payload); } } @@ -410,54 +411,54 @@ struct ceph_osd_request_head { // Always keep here the newest version of decoding order/rule if (header.version >= 8) { - ::decode(pgid, p); // actual pgid + decode(pgid, p); // actual pgid uint32_t hash; - ::decode(hash, p); // raw hash value + decode(hash, p); // raw hash value hobj.set_hash(hash); - ::decode(osdmap_epoch, p); - ::decode(flags, p); - ::decode(reqid, p); + decode(osdmap_epoch, p); + decode(flags, p); + decode(reqid, p); if (header.version >= 9) - ::decode(qos_params, p); + decode(qos_params, p); decode_trace(p); } else if (header.version == 7) { - ::decode(pgid.pgid, p); // raw pgid + decode(pgid.pgid, p); // raw pgid hobj.set_hash(pgid.pgid.ps()); - ::decode(osdmap_epoch, p); - ::decode(flags, p); + decode(osdmap_epoch, p); + decode(flags, p); eversion_t reassert_version; - ::decode(reassert_version, p); - ::decode(reqid, p); + decode(reassert_version, p); + decode(reqid, p); } else if (header.version < 2) { // old decode - ::decode(client_inc, p); + decode(client_inc, p); old_pg_t opgid; ::decode_raw(opgid, p); pgid.pgid = opgid; __u32 su; - ::decode(su, p); + decode(su, p); - ::decode(osdmap_epoch, p); - ::decode(flags, p); - ::decode(mtime, p); + decode(osdmap_epoch, p); + decode(flags, p); + decode(mtime, p); eversion_t reassert_version; - ::decode(reassert_version, p); + decode(reassert_version, p); __u32 oid_len; - ::decode(oid_len, p); - ::decode(hobj.snap, p); - ::decode(snap_seq, p); + decode(oid_len, p); + decode(hobj.snap, p); + decode(snap_seq, p); __u32 num_snaps; - ::decode(num_snaps, p); + decode(num_snaps, p); //::decode(ops, p); __u16 num_ops; - ::decode(num_ops, p); + decode(num_ops, p); ops.resize(num_ops); for (unsigned i = 0; i < num_ops; i++) - ::decode(ops[i].op, p); + decode(ops[i].op, p); decode_nohead(oid_len, hobj.oid.name, p); decode_nohead(num_snaps, snaps, p); @@ -480,49 +481,49 @@ struct ceph_osd_request_head { reqid = osd_reqid_t(); reqid.inc = client_inc; } else if (header.version < 7) { - ::decode(client_inc, p); - ::decode(osdmap_epoch, p); - ::decode(flags, p); - ::decode(mtime, p); + decode(client_inc, p); + decode(osdmap_epoch, p); + decode(flags, p); + decode(mtime, p); eversion_t reassert_version; - ::decode(reassert_version, p); + decode(reassert_version, p); object_locator_t oloc; - ::decode(oloc, p); + decode(oloc, p); if (header.version < 3) { old_pg_t opgid; ::decode_raw(opgid, p); pgid.pgid = opgid; } else { - ::decode(pgid.pgid, p); + decode(pgid.pgid, p); } - ::decode(hobj.oid, p); + decode(hobj.oid, p); //::decode(ops, p); __u16 num_ops; - ::decode(num_ops, p); + decode(num_ops, p); ops.resize(num_ops); for (unsigned i = 0; i < num_ops; i++) - ::decode(ops[i].op, p); + decode(ops[i].op, p); - ::decode(hobj.snap, p); - ::decode(snap_seq, p); - ::decode(snaps, p); + decode(hobj.snap, p); + decode(snap_seq, p); + decode(snaps, p); if (header.version >= 4) - ::decode(retry_attempt, p); + decode(retry_attempt, p); else retry_attempt = -1; if (header.version >= 5) - ::decode(features, p); + decode(features, p); else features = 0; if (header.version >= 6) - ::decode(reqid, p); + decode(reqid, p); else reqid = osd_reqid_t(); @@ -550,25 +551,25 @@ struct ceph_osd_request_head { return false; // Message is already final decoded assert(header.version >= 7); - ::decode(client_inc, p); - ::decode(mtime, p); + decode(client_inc, p); + decode(mtime, p); object_locator_t oloc; - ::decode(oloc, p); - ::decode(hobj.oid, p); + decode(oloc, p); + decode(hobj.oid, p); __u16 num_ops; - ::decode(num_ops, p); + decode(num_ops, p); ops.resize(num_ops); for (unsigned i = 0; i < num_ops; i++) - ::decode(ops[i].op, p); + decode(ops[i].op, p); - ::decode(hobj.snap, p); - ::decode(snap_seq, p); - ::decode(snaps, p); + decode(hobj.snap, p); + decode(snap_seq, p); + decode(snaps, p); - ::decode(retry_attempt, p); + decode(retry_attempt, p); - ::decode(features, p); + decode(features, p); hobj.pool = pgid.pgid.pool(); hobj.set_key(oloc.key); diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h index a1f773194f4..5f8a8b8dee2 100644 --- a/src/messages/MOSDOpReply.h +++ b/src/messages/MOSDOpReply.h @@ -162,6 +162,7 @@ private: public: void encode_payload(uint64_t features) override { + using ceph::encode; if(false == bdata_encode) { OSDOp::merge_osd_op_vector_out_data(ops, data); bdata_encode = true; @@ -178,89 +179,90 @@ public: head.result = result; head.num_ops = ops.size(); head.object_len = oid.name.length(); - ::encode(head, payload); + encode(head, payload); for (unsigned i = 0; i < head.num_ops; i++) { - ::encode(ops[i].op, payload); + encode(ops[i].op, payload); } - ::encode_nohead(oid.name, payload); + encode_nohead(oid.name, payload); } else { header.version = HEAD_VERSION; - ::encode(oid, payload); - ::encode(pgid, payload); - ::encode(flags, payload); - ::encode(result, payload); - ::encode(bad_replay_version, payload); - ::encode(osdmap_epoch, payload); + encode(oid, payload); + encode(pgid, payload); + encode(flags, payload); + encode(result, payload); + encode(bad_replay_version, payload); + encode(osdmap_epoch, payload); __u32 num_ops = ops.size(); - ::encode(num_ops, payload); + encode(num_ops, payload); for (unsigned i = 0; i < num_ops; i++) - ::encode(ops[i].op, payload); + encode(ops[i].op, payload); - ::encode(retry_attempt, payload); + encode(retry_attempt, payload); for (unsigned i = 0; i < num_ops; i++) - ::encode(ops[i].rval, payload); + encode(ops[i].rval, payload); - ::encode(replay_version, payload); - ::encode(user_version, payload); + encode(replay_version, payload); + encode(user_version, payload); if ((features & CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING) == 0) { header.version = 6; - ::encode(redirect, payload); + encode(redirect, payload); } else { do_redirect = !redirect.empty(); - ::encode(do_redirect, payload); + encode(do_redirect, payload); if (do_redirect) { - ::encode(redirect, payload); + encode(redirect, payload); } if ((features & CEPH_FEATURE_QOS_DMC) == 0) { header.version = 8; } else { - ::encode(qos_resp, payload); + encode(qos_resp, payload); } } encode_trace(payload, features); } } void decode_payload() override { + using ceph::decode; bufferlist::iterator p = payload.begin(); // Always keep here the newest version of decoding order/rule if (header.version == HEAD_VERSION) { - ::decode(oid, p); - ::decode(pgid, p); - ::decode(flags, p); - ::decode(result, p); - ::decode(bad_replay_version, p); - ::decode(osdmap_epoch, p); + decode(oid, p); + decode(pgid, p); + decode(flags, p); + decode(result, p); + decode(bad_replay_version, p); + decode(osdmap_epoch, p); __u32 num_ops = ops.size(); - ::decode(num_ops, p); + decode(num_ops, p); ops.resize(num_ops); for (unsigned i = 0; i < num_ops; i++) - ::decode(ops[i].op, p); - ::decode(retry_attempt, p); + decode(ops[i].op, p); + decode(retry_attempt, p); for (unsigned i = 0; i < num_ops; ++i) - ::decode(ops[i].rval, p); + decode(ops[i].rval, p); OSDOp::split_osd_op_vector_out_data(ops, data); - ::decode(replay_version, p); - ::decode(user_version, p); - ::decode(do_redirect, p); + decode(replay_version, p); + decode(user_version, p); + decode(do_redirect, p); if (do_redirect) - ::decode(redirect, p); - ::decode(qos_resp, p); + decode(redirect, p); + decode(qos_resp, p); decode_trace(p); } else if (header.version < 2) { ceph_osd_reply_head head; - ::decode(head, p); + decode(head, p); ops.resize(head.num_ops); for (unsigned i = 0; i < head.num_ops; i++) { - ::decode(ops[i].op, p); + decode(ops[i].op, p); } - ::decode_nohead(head.object_len, oid.name, p); + decode_nohead(head.object_len, oid.name, p); pgid = pg_t(head.layout.ol_pgid); result = (int32_t)head.result; flags = head.flags; @@ -269,52 +271,52 @@ public: osdmap_epoch = head.osdmap_epoch; retry_attempt = -1; } else { - ::decode(oid, p); - ::decode(pgid, p); - ::decode(flags, p); - ::decode(result, p); - ::decode(bad_replay_version, p); - ::decode(osdmap_epoch, p); + decode(oid, p); + decode(pgid, p); + decode(flags, p); + decode(result, p); + decode(bad_replay_version, p); + decode(osdmap_epoch, p); __u32 num_ops = ops.size(); - ::decode(num_ops, p); + decode(num_ops, p); ops.resize(num_ops); for (unsigned i = 0; i < num_ops; i++) - ::decode(ops[i].op, p); + decode(ops[i].op, p); if (header.version >= 3) - ::decode(retry_attempt, p); + decode(retry_attempt, p); else retry_attempt = -1; if (header.version >= 4) { for (unsigned i = 0; i < num_ops; ++i) - ::decode(ops[i].rval, p); + decode(ops[i].rval, p); OSDOp::split_osd_op_vector_out_data(ops, data); } if (header.version >= 5) { - ::decode(replay_version, p); - ::decode(user_version, p); + decode(replay_version, p); + decode(user_version, p); } else { replay_version = bad_replay_version; user_version = replay_version.version; } if (header.version == 6) { - ::decode(redirect, p); + decode(redirect, p); do_redirect = !redirect.empty(); } if (header.version >= 7) { - ::decode(do_redirect, p); + decode(do_redirect, p); if (do_redirect) { - ::decode(redirect, p); + decode(redirect, p); } } if (header.version >= 8) { if (header.version >= 9) { - ::decode(qos_resp, p); + decode(qos_resp, p); } decode_trace(p); } diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h index 9146dd4040b..bb11d23b9f1 100644 --- a/src/messages/MOSDPGBackfill.h +++ b/src/messages/MOSDPGBackfill.h @@ -53,37 +53,38 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(op, p); - ::decode(map_epoch, p); - ::decode(query_epoch, p); - ::decode(pgid.pgid, p); - ::decode(last_backfill, p); + decode(op, p); + decode(map_epoch, p); + decode(query_epoch, p); + decode(pgid.pgid, p); + decode(last_backfill, p); // For compatibility with version 1 - ::decode(stats.stats, p); + decode(stats.stats, p); - ::decode(stats, p); + decode(stats, p); // Handle hobject_t format change if (!last_backfill.is_max() && last_backfill.pool == -1) last_backfill.pool = pgid.pool(); - ::decode(pgid.shard, p); + decode(pgid.shard, p); } void encode_payload(uint64_t features) override { - ::encode(op, payload); - ::encode(map_epoch, payload); - ::encode(query_epoch, payload); - ::encode(pgid.pgid, payload); - ::encode(last_backfill, payload); + using ceph::encode; + encode(op, payload); + encode(map_epoch, payload); + encode(query_epoch, payload); + encode(pgid.pgid, payload); + encode(last_backfill, payload); // For compatibility with version 1 - ::encode(stats.stats, payload); + encode(stats.stats, payload); - ::encode(stats, payload); + encode(stats, payload); - ::encode(pgid.shard, payload); + encode(pgid.shard, payload); } MOSDPGBackfill() diff --git a/src/messages/MOSDPGBackfillRemove.h b/src/messages/MOSDPGBackfillRemove.h index 3f3c8964a61..02c81e6099e 100644 --- a/src/messages/MOSDPGBackfillRemove.h +++ b/src/messages/MOSDPGBackfillRemove.h @@ -51,22 +51,23 @@ private: ~MOSDPGBackfillRemove() {} public: - const char *get_type_name() const { return "backfill_remove"; } - void print(ostream& out) const { + const char *get_type_name() const override { return "backfill_remove"; } + void print(ostream& out) const override { out << "backfill_remove(" << pgid << " e" << map_epoch << " " << ls << ")"; } - void encode_payload(uint64_t features) { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(ls, payload); + void encode_payload(uint64_t features) override { + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(ls, payload); } - void decode_payload() { + void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(ls, p); + decode(pgid, p); + decode(map_epoch, p); + decode(ls, p); } }; diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h index 97e5e365234..67ca3f01a05 100644 --- a/src/messages/MOSDPGCreate.h +++ b/src/messages/MOSDPGCreate.h @@ -44,15 +44,16 @@ public: const char *get_type_name() const override { return "pg_create"; } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(mkpg, payload); - ::encode(ctimes, payload); + using ceph::encode; + encode(epoch, payload); + encode(mkpg, payload); + encode(ctimes, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(mkpg, p); - ::decode(ctimes, p); + decode(epoch, p); + decode(mkpg, p); + decode(ctimes, p); } void print(ostream& out) const override { diff --git a/src/messages/MOSDPGCreated.h b/src/messages/MOSDPGCreated.h index 13ec10faa8c..4a28dcf8adc 100644 --- a/src/messages/MOSDPGCreated.h +++ b/src/messages/MOSDPGCreated.h @@ -21,12 +21,13 @@ public: out << "osd_pg_created(" << pgid << ")"; } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(pgid, payload); + encode(pgid, payload); } void decode_payload() override { auto p = payload.begin(); paxos_decode(p); - ::decode(pgid, p); + decode(pgid, p); } }; diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h index c22e6c03067..e51bf4a0476 100644 --- a/src/messages/MOSDPGInfo.h +++ b/src/messages/MOSDPGInfo.h @@ -58,13 +58,14 @@ public: } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(pg_list, payload); + using ceph::encode; + encode(epoch, payload); + encode(pg_list, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(pg_list, p); + decode(epoch, p); + decode(pg_list, p); } }; diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h index ed011f5c1ec..37ed5089cc9 100644 --- a/src/messages/MOSDPGLog.h +++ b/src/messages/MOSDPGLog.h @@ -76,25 +76,26 @@ public: } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(info, payload); - ::encode(log, payload); - ::encode(missing, payload); - ::encode(query_epoch, payload); - ::encode(past_intervals, payload); - ::encode(to, payload); - ::encode(from, payload); + using ceph::encode; + encode(epoch, payload); + encode(info, payload); + encode(log, payload); + encode(missing, payload); + encode(query_epoch, payload); + encode(past_intervals, payload); + encode(to, payload); + encode(from, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(info, p); + decode(epoch, p); + decode(info, p); log.decode(p, info.pgid.pool()); missing.decode(p, info.pgid.pool()); - ::decode(query_epoch, p); - ::decode(past_intervals, p); - ::decode(to, p); - ::decode(from, p); + decode(query_epoch, p); + decode(past_intervals, p); + decode(to, p); + decode(from, p); } }; diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h index 153d57764e1..358e258b34e 100644 --- a/src/messages/MOSDPGNotify.h +++ b/src/messages/MOSDPGNotify.h @@ -58,14 +58,15 @@ public: const char *get_type_name() const override { return "PGnot"; } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(pg_list, payload); + using ceph::encode; + encode(epoch, payload); + encode(pg_list, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(pg_list, p); + decode(epoch, p); + decode(pg_list, p); } void print(ostream& out) const override { out << "pg_notify("; diff --git a/src/messages/MOSDPGPull.h b/src/messages/MOSDPGPull.h index 6a42d22b9b1..542bb613369 100644 --- a/src/messages/MOSDPGPull.h +++ b/src/messages/MOSDPGPull.h @@ -66,27 +66,28 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid.pgid, p); - ::decode(map_epoch, p); - ::decode(pulls, p); - ::decode(cost, p); - ::decode(pgid.shard, p); - ::decode(from, p); + decode(pgid.pgid, p); + decode(map_epoch, p); + decode(pulls, p); + decode(cost, p); + decode(pgid.shard, p); + decode(from, p); if (header.version >= 3) { - ::decode(min_epoch, p); + decode(min_epoch, p); } else { min_epoch = map_epoch; } } void encode_payload(uint64_t features) override { - ::encode(pgid.pgid, payload); - ::encode(map_epoch, payload); - ::encode(pulls, payload, features); - ::encode(cost, payload); - ::encode(pgid.shard, payload); - ::encode(from, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid.pgid, payload); + encode(map_epoch, payload); + encode(pulls, payload, features); + encode(cost, payload); + encode(pgid.shard, payload); + encode(from, payload); + encode(min_epoch, payload); } const char *get_type_name() const override { return "MOSDPGPull"; } diff --git a/src/messages/MOSDPGPush.h b/src/messages/MOSDPGPush.h index cf62f82f91f..4c8cada013c 100644 --- a/src/messages/MOSDPGPush.h +++ b/src/messages/MOSDPGPush.h @@ -65,27 +65,28 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid.pgid, p); - ::decode(map_epoch, p); - ::decode(pushes, p); - ::decode(cost, p); - ::decode(pgid.shard, p); - ::decode(from, p); + decode(pgid.pgid, p); + decode(map_epoch, p); + decode(pushes, p); + decode(cost, p); + decode(pgid.shard, p); + decode(from, p); if (header.version >= 3) { - ::decode(min_epoch, p); + decode(min_epoch, p); } else { min_epoch = map_epoch; } } void encode_payload(uint64_t features) override { - ::encode(pgid.pgid, payload); - ::encode(map_epoch, payload); - ::encode(pushes, payload, features); - ::encode(cost, payload); - ::encode(pgid.shard, payload); - ::encode(from, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid.pgid, payload); + encode(map_epoch, payload); + encode(pushes, payload, features); + encode(cost, payload); + encode(pgid.shard, payload); + encode(from, payload); + encode(min_epoch, payload); } const char *get_type_name() const override { return "MOSDPGPush"; } diff --git a/src/messages/MOSDPGPushReply.h b/src/messages/MOSDPGPushReply.h index f1f060720e1..7ada9e6a63b 100644 --- a/src/messages/MOSDPGPushReply.h +++ b/src/messages/MOSDPGPushReply.h @@ -58,27 +58,28 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid.pgid, p); - ::decode(map_epoch, p); - ::decode(replies, p); - ::decode(cost, p); - ::decode(pgid.shard, p); - ::decode(from, p); + decode(pgid.pgid, p); + decode(map_epoch, p); + decode(replies, p); + decode(cost, p); + decode(pgid.shard, p); + decode(from, p); if (header.version >= 3) { - ::decode(min_epoch, p); + decode(min_epoch, p); } else { min_epoch = map_epoch; } } void encode_payload(uint64_t features) override { - ::encode(pgid.pgid, payload); - ::encode(map_epoch, payload); - ::encode(replies, payload); - ::encode(cost, payload); - ::encode(pgid.shard, payload); - ::encode(from, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid.pgid, payload); + encode(map_epoch, payload); + encode(replies, payload); + encode(cost, payload); + encode(pgid.shard, payload); + encode(from, payload); + encode(min_epoch, payload); } void print(ostream& out) const override { diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h index bdeab006d05..c2768d0c33f 100644 --- a/src/messages/MOSDPGQuery.h +++ b/src/messages/MOSDPGQuery.h @@ -63,13 +63,14 @@ public: } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(pg_list, payload, features); + using ceph::encode; + encode(epoch, payload); + encode(pg_list, payload, features); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(pg_list, p); + decode(epoch, p); + decode(pg_list, p); } }; diff --git a/src/messages/MOSDPGRecoveryDelete.h b/src/messages/MOSDPGRecoveryDelete.h index a135be47eee..3fd90c8236b 100644 --- a/src/messages/MOSDPGRecoveryDelete.h +++ b/src/messages/MOSDPGRecoveryDelete.h @@ -67,21 +67,22 @@ public: } void encode_payload(uint64_t features) { - ::encode(from, payload); - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(min_epoch, payload); - ::encode(cost, payload); - ::encode(objects, payload); + using ceph::encode; + encode(from, payload); + encode(pgid, payload); + encode(map_epoch, payload); + encode(min_epoch, payload); + encode(cost, payload); + encode(objects, payload); } void decode_payload() { bufferlist::iterator p = payload.begin(); - ::decode(from, p); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(min_epoch, p); - ::decode(cost, p); - ::decode(objects, p); + decode(from, p); + decode(pgid, p); + decode(map_epoch, p); + decode(min_epoch, p); + decode(cost, p); + decode(objects, p); } }; diff --git a/src/messages/MOSDPGRecoveryDeleteReply.h b/src/messages/MOSDPGRecoveryDeleteReply.h index f0789b46076..5324c1714c4 100644 --- a/src/messages/MOSDPGRecoveryDeleteReply.h +++ b/src/messages/MOSDPGRecoveryDeleteReply.h @@ -32,21 +32,22 @@ struct MOSDPGRecoveryDeleteReply : public MOSDFastDispatchOp { void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid.pgid, p); - ::decode(map_epoch, p); - ::decode(min_epoch, p); - ::decode(objects, p); - ::decode(pgid.shard, p); - ::decode(from, p); + decode(pgid.pgid, p); + decode(map_epoch, p); + decode(min_epoch, p); + decode(objects, p); + decode(pgid.shard, p); + decode(from, p); } void encode_payload(uint64_t features) override { - ::encode(pgid.pgid, payload); - ::encode(map_epoch, payload); - ::encode(min_epoch, payload); - ::encode(objects, payload); - ::encode(pgid.shard, payload); - ::encode(from, payload); + using ceph::encode; + encode(pgid.pgid, payload); + encode(map_epoch, payload); + encode(min_epoch, payload); + encode(objects, payload); + encode(pgid.shard, payload); + encode(from, payload); } void print(ostream& out) const override { diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h index 026befc48fb..fc406391041 100644 --- a/src/messages/MOSDPGRemove.h +++ b/src/messages/MOSDPGRemove.h @@ -46,13 +46,14 @@ public: const char *get_type_name() const override { return "PGrm"; } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(pg_list, payload); + using ceph::encode; + encode(epoch, payload); + encode(pg_list, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(pg_list, p); + decode(epoch, p); + decode(pg_list, p); } void print(ostream& out) const override { out << "osd pg remove(" << "epoch " << epoch << "; "; diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h index 16fa3c52294..e76572471f6 100644 --- a/src/messages/MOSDPGScan.h +++ b/src/messages/MOSDPGScan.h @@ -53,12 +53,12 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(op, p); - ::decode(map_epoch, p); - ::decode(query_epoch, p); - ::decode(pgid.pgid, p); - ::decode(begin, p); - ::decode(end, p); + decode(op, p); + decode(map_epoch, p); + decode(query_epoch, p); + decode(pgid.pgid, p); + decode(begin, p); + decode(end, p); // handle hobject_t format upgrade if (!begin.is_max() && begin.pool == -1) @@ -66,19 +66,20 @@ public: if (!end.is_max() && end.pool == -1) end.pool = pgid.pool(); - ::decode(from, p); - ::decode(pgid.shard, p); + decode(from, p); + decode(pgid.shard, p); } void encode_payload(uint64_t features) override { - ::encode(op, payload); - ::encode(map_epoch, payload); - ::encode(query_epoch, payload); - ::encode(pgid.pgid, payload); - ::encode(begin, payload); - ::encode(end, payload); - ::encode(from, payload); - ::encode(pgid.shard, payload); + using ceph::encode; + encode(op, payload); + encode(map_epoch, payload); + encode(query_epoch, payload); + encode(pgid.pgid, payload); + encode(begin, payload); + encode(end, payload); + encode(from, payload); + encode(pgid.shard, payload); } MOSDPGScan() diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h index 1cdaed9b2c2..6017dd25a26 100644 --- a/src/messages/MOSDPGTemp.h +++ b/src/messages/MOSDPGTemp.h @@ -37,18 +37,19 @@ private: public: void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(map_epoch, payload); - ::encode(pg_temp, payload); - ::encode(forced, payload); + encode(map_epoch, payload); + encode(pg_temp, payload); + encode(forced, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(map_epoch, p); - ::decode(pg_temp, p); + decode(map_epoch, p); + decode(pg_temp, p); if (header.version >= 2) { - ::decode(forced, p); + decode(forced, p); } } diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h index 35168e0f484..ef780705685 100644 --- a/src/messages/MOSDPGTrim.h +++ b/src/messages/MOSDPGTrim.h @@ -43,17 +43,18 @@ public: } void encode_payload(uint64_t features) override { - ::encode(epoch, payload); - ::encode(pgid.pgid, payload); - ::encode(trim_to, payload); - ::encode(pgid.shard, payload); + using ceph::encode; + encode(epoch, payload); + encode(pgid.pgid, payload); + encode(trim_to, payload); + encode(pgid.shard, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(epoch, p); - ::decode(pgid.pgid, p); - ::decode(trim_to, p); - ::decode(pgid.shard, p); + decode(epoch, p); + decode(pgid.pgid, p); + decode(trim_to, p); + decode(pgid.shard, p); } }; diff --git a/src/messages/MOSDPGUpdateLogMissing.h b/src/messages/MOSDPGUpdateLogMissing.h index 3ca37f63124..652757a69aa 100644 --- a/src/messages/MOSDPGUpdateLogMissing.h +++ b/src/messages/MOSDPGUpdateLogMissing.h @@ -78,22 +78,23 @@ public: } void encode_payload(uint64_t features) override { - ::encode(map_epoch, payload); - ::encode(pgid, payload); - ::encode(from, payload); - ::encode(rep_tid, payload); - ::encode(entries, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(map_epoch, payload); + encode(pgid, payload); + encode(from, payload); + encode(rep_tid, payload); + encode(entries, payload); + encode(min_epoch, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(map_epoch, p); - ::decode(pgid, p); - ::decode(from, p); - ::decode(rep_tid, p); - ::decode(entries, p); + decode(map_epoch, p); + decode(pgid, p); + decode(from, p); + decode(rep_tid, p); + decode(entries, p); if (header.version >= 2) { - ::decode(min_epoch, p); + decode(min_epoch, p); } else { min_epoch = map_epoch; } diff --git a/src/messages/MOSDPGUpdateLogMissingReply.h b/src/messages/MOSDPGUpdateLogMissingReply.h index e50b8173b06..e7d088a1fda 100644 --- a/src/messages/MOSDPGUpdateLogMissingReply.h +++ b/src/messages/MOSDPGUpdateLogMissingReply.h @@ -82,20 +82,21 @@ public: } void encode_payload(uint64_t features) override { - ::encode(map_epoch, payload); - ::encode(pgid, payload); - ::encode(from, payload); - ::encode(rep_tid, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(map_epoch, payload); + encode(pgid, payload); + encode(from, payload); + encode(rep_tid, payload); + encode(min_epoch, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(map_epoch, p); - ::decode(pgid, p); - ::decode(from, p); - ::decode(rep_tid, p); + decode(map_epoch, p); + decode(pgid, p); + decode(from, p); + decode(rep_tid, p); if (header.version >= 2) { - ::decode(min_epoch, p); + decode(min_epoch, p); } else { min_epoch = map_epoch; } diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h index 13c04660ba3..5cf554e95f7 100644 --- a/src/messages/MOSDPing.h +++ b/src/messages/MOSDPing.h @@ -77,28 +77,29 @@ private: public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(map_epoch, p); - ::decode(op, p); - ::decode(stamp, p); + decode(fsid, p); + decode(map_epoch, p); + decode(op, p); + decode(stamp, p); int payload_mid_length = p.get_off(); uint32_t size; - ::decode(size, p); + decode(size, p); p.advance(size); min_message_size = size + payload_mid_length; } void encode_payload(uint64_t features) override { - ::encode(fsid, payload); - ::encode(map_epoch, payload); - ::encode(op, payload); - ::encode(stamp, payload); + using ceph::encode; + encode(fsid, payload); + encode(map_epoch, payload); + encode(op, payload); + encode(stamp, payload); size_t s = 0; if (min_message_size > payload.length()) { s = min_message_size - payload.length(); } - ::encode((uint32_t)s, payload); + encode((uint32_t)s, payload); if (s) { // this should be big enough for normal min_message padding sizes. since // we are targetting jumbo ethernet frames around 9000 bytes, 16k should diff --git a/src/messages/MOSDRepOp.h b/src/messages/MOSDRepOp.h index 86653531f44..677c4623a9f 100644 --- a/src/messages/MOSDRepOp.h +++ b/src/messages/MOSDRepOp.h @@ -80,61 +80,62 @@ public: void decode_payload() override { p = payload.begin(); // splitted to partial and final - ::decode(map_epoch, p); + decode(map_epoch, p); if (header.version >= 2) { - ::decode(min_epoch, p); + decode(min_epoch, p); decode_trace(p); } else { min_epoch = map_epoch; } - ::decode(reqid, p); - ::decode(pgid, p); + decode(reqid, p); + decode(pgid, p); } void finish_decode() { if (!final_decode_needed) return; // Message is already final decoded - ::decode(poid, p); + decode(poid, p); - ::decode(acks_wanted, p); - ::decode(version, p); - ::decode(logbl, p); - ::decode(pg_stats, p); - ::decode(pg_trim_to, p); + decode(acks_wanted, p); + decode(version, p); + decode(logbl, p); + decode(pg_stats, p); + decode(pg_trim_to, p); - ::decode(new_temp_oid, p); - ::decode(discard_temp_oid, p); + decode(new_temp_oid, p); + decode(discard_temp_oid, p); - ::decode(from, p); - ::decode(updated_hit_set_history, p); - ::decode(pg_roll_forward_to, p); + decode(from, p); + decode(updated_hit_set_history, p); + decode(pg_roll_forward_to, p); final_decode_needed = false; } void encode_payload(uint64_t features) override { - ::encode(map_epoch, payload); + using ceph::encode; + encode(map_epoch, payload); if (HAVE_FEATURE(features, SERVER_LUMINOUS)) { header.version = HEAD_VERSION; - ::encode(min_epoch, payload); + encode(min_epoch, payload); encode_trace(payload, features); } else { header.version = 1; } - ::encode(reqid, payload); - ::encode(pgid, payload); - ::encode(poid, payload); - - ::encode(acks_wanted, payload); - ::encode(version, payload); - ::encode(logbl, payload); - ::encode(pg_stats, payload); - ::encode(pg_trim_to, payload); - ::encode(new_temp_oid, payload); - ::encode(discard_temp_oid, payload); - ::encode(from, payload); - ::encode(updated_hit_set_history, payload); - ::encode(pg_roll_forward_to, payload); + encode(reqid, payload); + encode(pgid, payload); + encode(poid, payload); + + encode(acks_wanted, payload); + encode(version, payload); + encode(logbl, payload); + encode(pg_stats, payload); + encode(pg_trim_to, payload); + encode(new_temp_oid, payload); + encode(discard_temp_oid, payload); + encode(from, payload); + encode(updated_hit_set_history, payload); + encode(pg_roll_forward_to, payload); } MOSDRepOp() diff --git a/src/messages/MOSDRepOpReply.h b/src/messages/MOSDRepOpReply.h index adeee925373..97ca483f4aa 100644 --- a/src/messages/MOSDRepOpReply.h +++ b/src/messages/MOSDRepOpReply.h @@ -62,42 +62,43 @@ public: void decode_payload() override { p = payload.begin(); - ::decode(map_epoch, p); + decode(map_epoch, p); if (header.version >= 2) { - ::decode(min_epoch, p); + decode(min_epoch, p); decode_trace(p); } else { min_epoch = map_epoch; } - ::decode(reqid, p); - ::decode(pgid, p); + decode(reqid, p); + decode(pgid, p); } void finish_decode() { if (!final_decode_needed) return; // Message is already final decoded - ::decode(ack_type, p); - ::decode(result, p); - ::decode(last_complete_ondisk, p); + decode(ack_type, p); + decode(result, p); + decode(last_complete_ondisk, p); - ::decode(from, p); + decode(from, p); final_decode_needed = false; } void encode_payload(uint64_t features) override { - ::encode(map_epoch, payload); + using ceph::encode; + encode(map_epoch, payload); if (HAVE_FEATURE(features, SERVER_LUMINOUS)) { header.version = HEAD_VERSION; - ::encode(min_epoch, payload); + encode(min_epoch, payload); encode_trace(payload, features); } else { header.version = 1; } - ::encode(reqid, payload); - ::encode(pgid, payload); - ::encode(ack_type, payload); - ::encode(result, payload); - ::encode(last_complete_ondisk, payload); - ::encode(from, payload); + encode(reqid, payload); + encode(pgid, payload); + encode(ack_type, payload); + encode(result, payload); + encode(last_complete_ondisk, payload); + encode(from, payload); } spg_t get_pg() { return pgid; } diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h index ce800aac068..134c40835dd 100644 --- a/src/messages/MOSDRepScrub.h +++ b/src/messages/MOSDRepScrub.h @@ -85,32 +85,33 @@ public: } void encode_payload(uint64_t features) override { - ::encode(pgid.pgid, payload); - ::encode(scrub_from, payload); - ::encode(scrub_to, payload); - ::encode(map_epoch, payload); - ::encode(chunky, payload); - ::encode(start, payload); - ::encode(end, payload); - ::encode(deep, payload); - ::encode(pgid.shard, payload); - ::encode(seed, payload); - ::encode(min_epoch, payload); + using ceph::encode; + encode(pgid.pgid, payload); + encode(scrub_from, payload); + encode(scrub_to, payload); + encode(map_epoch, payload); + encode(chunky, payload); + encode(start, payload); + encode(end, payload); + encode(deep, payload); + encode(pgid.shard, payload); + encode(seed, payload); + encode(min_epoch, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid.pgid, p); - ::decode(scrub_from, p); - ::decode(scrub_to, p); - ::decode(map_epoch, p); - ::decode(chunky, p); - ::decode(start, p); - ::decode(end, p); - ::decode(deep, p); - ::decode(pgid.shard, p); - ::decode(seed, p); + decode(pgid.pgid, p); + decode(scrub_from, p); + decode(scrub_to, p); + decode(map_epoch, p); + decode(chunky, p); + decode(start, p); + decode(end, p); + decode(deep, p); + decode(pgid.shard, p); + decode(seed, p); if (header.version >= 7) { - ::decode(min_epoch, p); + decode(min_epoch, p); } else { min_epoch = map_epoch; } diff --git a/src/messages/MOSDRepScrubMap.h b/src/messages/MOSDRepScrubMap.h index f17bb0c2cf3..9cec29c6857 100644 --- a/src/messages/MOSDRepScrubMap.h +++ b/src/messages/MOSDRepScrubMap.h @@ -51,22 +51,23 @@ private: ~MOSDRepScrubMap() {} public: - const char *get_type_name() const { return "rep_scrubmap"; } - void print(ostream& out) const { + const char *get_type_name() const override { return "rep_scrubmap"; } + void print(ostream& out) const override { out << "rep_scrubmap(" << pgid << " e" << map_epoch << " from shard " << from << ")"; } - void encode_payload(uint64_t features) { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(from, payload); + void encode_payload(uint64_t features) override { + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(from, payload); } - void decode_payload() { + void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(from, p); + decode(pgid, p); + decode(map_epoch, p); + decode(from, p); } }; diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h index d9659fa7fb9..fbf3c424e0a 100644 --- a/src/messages/MOSDScrub.h +++ b/src/messages/MOSDScrub.h @@ -58,17 +58,18 @@ public: } void encode_payload(uint64_t features) override { - ::encode(fsid, payload); - ::encode(scrub_pgs, payload); - ::encode(repair, payload); - ::encode(deep, payload); + using ceph::encode; + encode(fsid, payload); + encode(scrub_pgs, payload); + encode(repair, payload); + encode(deep, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(fsid, p); - ::decode(scrub_pgs, p); - ::decode(repair, p); - ::decode(deep, p); + decode(fsid, p); + decode(scrub_pgs, p); + decode(repair, p); + decode(deep, p); } }; diff --git a/src/messages/MOSDScrubReserve.h b/src/messages/MOSDScrubReserve.h index 6eb39967a94..08c77e66df1 100644 --- a/src/messages/MOSDScrubReserve.h +++ b/src/messages/MOSDScrubReserve.h @@ -76,17 +76,18 @@ public: void decode_payload() { bufferlist::iterator p = payload.begin(); - ::decode(pgid, p); - ::decode(map_epoch, p); - ::decode(type, p); - ::decode(from, p); + decode(pgid, p); + decode(map_epoch, p); + decode(type, p); + decode(from, p); } void encode_payload(uint64_t features) { - ::encode(pgid, payload); - ::encode(map_epoch, payload); - ::encode(type, payload); - ::encode(from, payload); + using ceph::encode; + encode(pgid, payload); + encode(map_epoch, payload); + encode(type, payload); + encode(from, payload); } }; diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h index c368675a89d..5a070c51a60 100644 --- a/src/messages/MPGStats.h +++ b/src/messages/MPGStats.h @@ -44,21 +44,22 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(osd_stat, payload); - ::encode(pg_stat, payload); - ::encode(epoch, payload); - ::encode(had_map_for, payload); + encode(fsid, payload); + encode(osd_stat, payload); + encode(pg_stat, payload); + encode(epoch, payload); + encode(had_map_for, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(osd_stat, p); - ::decode(pg_stat, p); - ::decode(epoch, p); - ::decode(had_map_for, p); + decode(fsid, p); + decode(osd_stat, p); + decode(pg_stat, p); + decode(epoch, p); + decode(had_map_for, p); } }; diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h index 361ba7cac0c..d9b9d8e3b7b 100644 --- a/src/messages/MPGStatsAck.h +++ b/src/messages/MPGStatsAck.h @@ -33,11 +33,12 @@ public: } void encode_payload(uint64_t features) override { - ::encode(pg_stat, payload); + using ceph::encode; + encode(pg_stat, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pg_stat, p); + decode(pg_stat, p); } }; diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h index 15d97faa2c4..bdc4d5f443a 100644 --- a/src/messages/MPoolOp.h +++ b/src/messages/MPoolOp.h @@ -62,35 +62,36 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(pool, payload); - ::encode(op, payload); - ::encode(auid, payload); - ::encode(snapid, payload); - ::encode(name, payload); + encode(fsid, payload); + encode(pool, payload); + encode(op, payload); + encode(auid, payload); + encode(snapid, payload); + encode(name, payload); __u8 pad = 0; - ::encode(pad, payload); /* for v3->v4 encoding change */ - ::encode(crush_rule, payload); + encode(pad, payload); /* for v3->v4 encoding change */ + encode(crush_rule, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(pool, p); + decode(fsid, p); + decode(pool, p); if (header.version < 2) - ::decode(name, p); - ::decode(op, p); - ::decode(auid, p); - ::decode(snapid, p); + decode(name, p); + decode(op, p); + decode(auid, p); + decode(snapid, p); if (header.version >= 2) - ::decode(name, p); + decode(name, p); if (header.version >= 3) { __u8 pad; - ::decode(pad, p); + decode(pad, p); if (header.version >= 4) - ::decode(crush_rule, p); + decode(crush_rule, p); else crush_rule = pad; } else diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h index 0374c1d904a..ce652aa2fa9 100644 --- a/src/messages/MPoolOpReply.h +++ b/src/messages/MPoolOpReply.h @@ -53,26 +53,27 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(replyCode, payload); - ::encode(epoch, payload); + encode(fsid, payload); + encode(replyCode, payload); + encode(epoch, payload); if (response_data.length()) { - ::encode(true, payload); - ::encode(response_data, payload); + encode(true, payload); + encode(response_data, payload); } else - ::encode(false, payload); + encode(false, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); - ::decode(replyCode, p); - ::decode(epoch, p); + decode(fsid, p); + decode(replyCode, p); + decode(epoch, p); bool has_response_data; - ::decode(has_response_data, p); + decode(has_response_data, p); if (has_response_data) { - ::decode(response_data, p); + decode(response_data, p); } } }; diff --git a/src/messages/MRecoveryReserve.h b/src/messages/MRecoveryReserve.h index 51d746f01a8..3bf0cccc85c 100644 --- a/src/messages/MRecoveryReserve.h +++ b/src/messages/MRecoveryReserve.h @@ -70,21 +70,22 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(pgid.pgid, p); - ::decode(query_epoch, p); - ::decode(type, p); - ::decode(pgid.shard, p); + decode(pgid.pgid, p); + decode(query_epoch, p); + decode(type, p); + decode(pgid.shard, p); if (header.version >= 3) { - ::decode(priority, p); + decode(priority, p); } } void encode_payload(uint64_t features) override { - ::encode(pgid.pgid, payload); - ::encode(query_epoch, payload); - ::encode(type, payload); - ::encode(pgid.shard, payload); - ::encode(priority, payload); + using ceph::encode; + encode(pgid.pgid, payload); + encode(query_epoch, payload); + encode(type, payload); + encode(pgid.shard, payload); + encode(priority, payload); } }; diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h index 9b0fa4ae7f6..77829a319e1 100644 --- a/src/messages/MRemoveSnaps.h +++ b/src/messages/MRemoveSnaps.h @@ -36,13 +36,14 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(snaps, payload); + encode(snaps, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(snaps, p); + decode(snaps, p); assert(p.end()); } diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h index 179cf598597..25a66cec652 100644 --- a/src/messages/MRoute.h +++ b/src/messages/MRoute.h @@ -56,22 +56,23 @@ private: public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(session_mon_tid, p); - ::decode(dest, p); + decode(session_mon_tid, p); + decode(dest, p); bool m; - ::decode(m, p); + decode(m, p); if (m) msg = decode_message(NULL, 0, p); - ::decode(send_osdmap_first, p); + decode(send_osdmap_first, p); } void encode_payload(uint64_t features) override { - ::encode(session_mon_tid, payload); - ::encode(dest, payload, features); + using ceph::encode; + encode(session_mon_tid, payload); + encode(dest, payload, features); bool m = msg ? true : false; - ::encode(m, payload); + encode(m, payload); if (msg) encode_message(msg, features, payload); - ::encode(send_osdmap_first, payload); + encode(send_osdmap_first, payload); } const char *get_type_name() const override { return "route"; } diff --git a/src/messages/MServiceMap.h b/src/messages/MServiceMap.h index b7dd91310f7..f21601ac503 100644 --- a/src/messages/MServiceMap.h +++ b/src/messages/MServiceMap.h @@ -25,10 +25,11 @@ public: << service_map.services.size() << " svc)"; } void encode_payload(uint64_t features) override { - ::encode(service_map, payload, features); + using ceph::encode; + encode(service_map, payload, features); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(service_map, p); + decode(service_map, p); } }; diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h index ec18cfff04f..e17bb104769 100644 --- a/src/messages/MStatfs.h +++ b/src/messages/MStatfs.h @@ -47,16 +47,17 @@ public: } void encode_payload(uint64_t features) override { + using ceph::encode; paxos_encode(); - ::encode(fsid, payload); - ::encode(data_pool, payload); + encode(fsid, payload); + encode(data_pool, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); paxos_decode(p); - ::decode(fsid, p); + decode(fsid, p); if (header.version >= 2) { - ::decode(data_pool, p); + decode(data_pool, p); } else { data_pool = boost::optional (); } diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h index 195a369e15e..07aa583e2e6 100644 --- a/src/messages/MStatfsReply.h +++ b/src/messages/MStatfsReply.h @@ -33,11 +33,12 @@ public: } void encode_payload(uint64_t features) override { - ::encode(h, payload); + using ceph::encode; + encode(h, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(h, p); + decode(h, p); } }; diff --git a/src/messages/MTimeCheck.h b/src/messages/MTimeCheck.h index 8994e964664..a5d9556eecb 100644 --- a/src/messages/MTimeCheck.h +++ b/src/messages/MTimeCheck.h @@ -66,21 +66,22 @@ public: void decode_payload() override { bufferlist::iterator p = payload.begin(); - ::decode(op, p); - ::decode(epoch, p); - ::decode(round, p); - ::decode(timestamp, p); - ::decode(skews, p); - ::decode(latencies, p); + decode(op, p); + decode(epoch, p); + decode(round, p); + decode(timestamp, p); + decode(skews, p); + decode(latencies, p); } void encode_payload(uint64_t features) override { - ::encode(op, payload); - ::encode(epoch, payload); - ::encode(round, payload); - ::encode(timestamp, payload); - ::encode(skews, payload, features); - ::encode(latencies, payload, features); + using ceph::encode; + encode(op, payload); + encode(epoch, payload); + encode(round, payload); + encode(timestamp, payload); + encode(skews, payload, features); + encode(latencies, payload, features); } }; diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h index 15325abf61c..07e443bb72a 100644 --- a/src/messages/MWatchNotify.h +++ b/src/messages/MWatchNotify.h @@ -50,32 +50,33 @@ public: void decode_payload() override { uint8_t msg_ver; bufferlist::iterator p = payload.begin(); - ::decode(msg_ver, p); - ::decode(opcode, p); - ::decode(cookie, p); - ::decode(ver, p); - ::decode(notify_id, p); + decode(msg_ver, p); + decode(opcode, p); + decode(cookie, p); + decode(ver, p); + decode(notify_id, p); if (msg_ver >= 1) - ::decode(bl, p); + decode(bl, p); if (header.version >= 2) - ::decode(return_code, p); + decode(return_code, p); else return_code = 0; if (header.version >= 3) - ::decode(notifier_gid, p); + decode(notifier_gid, p); else notifier_gid = 0; } void encode_payload(uint64_t features) override { + using ceph::encode; uint8_t msg_ver = 1; - ::encode(msg_ver, payload); - ::encode(opcode, payload); - ::encode(cookie, payload); - ::encode(ver, payload); - ::encode(notify_id, payload); - ::encode(bl, payload); - ::encode(return_code, payload); - ::encode(notifier_gid, payload); + encode(msg_ver, payload); + encode(opcode, payload); + encode(cookie, payload); + encode(ver, payload); + encode(notify_id, payload); + encode(bl, payload); + encode(return_code, payload); + encode(notifier_gid, payload); } const char *get_type_name() const override { return "watch-notify"; } diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h index a85ac9e6c4a..2dfc0ff1bb4 100644 --- a/src/messages/PaxosServiceMessage.h +++ b/src/messages/PaxosServiceMessage.h @@ -27,15 +27,16 @@ class PaxosServiceMessage : public Message { public: void paxos_encode() { - ::encode(version, payload); - ::encode(deprecated_session_mon, payload); - ::encode(deprecated_session_mon_tid, payload); + using ceph::encode; + encode(version, payload); + encode(deprecated_session_mon, payload); + encode(deprecated_session_mon_tid, payload); } void paxos_decode( bufferlist::iterator& p ) { - ::decode(version, p); - ::decode(deprecated_session_mon, p); - ::decode(deprecated_session_mon_tid, p); + decode(version, p); + decode(deprecated_session_mon, p); + decode(deprecated_session_mon_tid, p); } void encode_payload(uint64_t features) override { -- 2.39.5