MOSDOpReply: rename reassert_version -> replay_version

Because that's what it's for. reassert_version is a bit ambiguous.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 65c4d43041d82839d4cff6c7c084fd46c2f99df3..7bbe6e24091ff3edc3456f46808966eece585103 100644 (file)
--- a/src/messages/MOSDOpReply.h
+++ b/src/messages/MOSDOpReply.h
@@ -39,7 +39,7 @@ class MOSDOpReply : public Message {
   vector<OSDOp> ops;
   int64_t flags;
   int32_t result;
-  eversion_t reassert_version;
+  eversion_t replay_version;
   epoch_t osdmap_epoch;
   int32_t retry_attempt;
 
@@ -52,10 +52,10 @@ public:
   bool     is_onnvram() const { return get_flags() & CEPH_OSD_FLAG_ONNVRAM; }
   
   int get_result() const { return result; }
-  eversion_t get_version() { return reassert_version; }
+  eversion_t get_version() { return replay_version; }
   
   void set_result(int r) { result = r; }
-  void set_version(eversion_t v) { reassert_version = v; }
+  void set_version(eversion_t v) { replay_version = v; }
 
   void add_flags(int f) { flags |= f; }
 
@@ -99,7 +99,7 @@ public:
     oid = req->oid;
     pgid = req->pgid;
     osdmap_epoch = e;
-    reassert_version = req->reassert_version;
+    replay_version = req->reassert_version;
     retry_attempt = req->get_retry_attempt();
 
     // zero out ops payload_len
@@ -121,7 +121,7 @@ public:
       head.layout.ol_pgid = pgid.get_old_pg().v;
       head.flags = flags;
       head.osdmap_epoch = osdmap_epoch;
-      head.reassert_version = reassert_version;
+      head.reassert_version = replay_version;
       head.result = result;
       head.num_ops = ops.size();
       head.object_len = oid.name.length();
@@ -135,7 +135,7 @@ public:
       ::encode(pgid, payload);
       ::encode(flags, payload);
       ::encode(result, payload);
-      ::encode(reassert_version, payload);
+      ::encode(replay_version, payload);
       ::encode(osdmap_epoch, payload);
 
       __u32 num_ops = ops.size();
@@ -162,7 +162,7 @@ public:
       pgid = pg_t(head.layout.ol_pgid);
       result = head.result;
       flags = head.flags;
-      reassert_version = head.reassert_version;
+      replay_version = head.reassert_version;
       osdmap_epoch = head.osdmap_epoch;
       retry_attempt = -1;
     } else {
@@ -170,7 +170,7 @@ public:
       ::decode(pgid, p);
       ::decode(flags, p);
       ::decode(result, p);
-      ::decode(reassert_version, p);
+      ::decode(replay_version, p);
       ::decode(osdmap_epoch, p);
 
       __u32 num_ops = ops.size();