summaryrefslogtreecommitdiff
path: root/src/messages
diff options
context:
space:
mode:
authorSage Weil <sage.weil@dreamhost.com>2012-01-30 12:28:34 -0800
committerSage Weil <sage.weil@dreamhost.com>2012-01-30 12:28:34 -0800
commit0107aee800163478e9fd4ba8bf342301356cf628 (patch)
tree56c5e16ec3d57dc5f82846f11e7303c6d4574017 /src/messages
parent5436bf5089fba80326ef3a3deed1aa207c3bb023 (diff)
downloadceph-0107aee800163478e9fd4ba8bf342301356cf628.tar.gz
msg: use absolute times for message encoding
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Diffstat (limited to 'src/messages')
-rw-r--r--src/messages/MHeartbeat.h2
-rw-r--r--src/messages/MMonPaxos.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
index 7197c78525d..7ea740de80a 100644
--- a/src/messages/MHeartbeat.h
+++ b/src/messages/MHeartbeat.h
@@ -55,7 +55,7 @@ public:
}
void decode_payload(CephContext *cct) {
bufferlist::iterator p = payload.begin();
- utime_t now(ceph_clock_now(cct));
+ utime_t now(ceph_clock_now(NULL));
::decode(load, now, p);
::decode(beat, p);
::decode(import_map, p);
diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index 5bc87f335f4..18329782993 100644
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -67,7 +67,7 @@ class MMonPaxos : public Message {
op(o), machine_id(mid),
first_committed(0), last_committed(0), pn_from(0), pn(0), uncommitted_pn(0),
latest_version(0) {
- sent_timestamp = ceph_clock_now(g_ceph_context);
+ sent_timestamp = ceph_clock_now(NULL);
}
private: