osd/: 's/trim_rollback_to/roll_forward_to/g'

trim_rollback_to was a not terrible name before in that all
it ever did is (possibly) trim the stashed version of the
object.  However, now, it's going to encompass, in general,
the roll_forward part of a tpc (which will still be to
delete the stashed object in cases where that is
appropriate).

Signed-off-by: Samuel Just <sjust@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index ae5465c3a9f..82b866dc803 100644
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -63,7 +63,7 @@ public:
 
   // piggybacked osd/og state
   eversion_t pg_trim_to;   // primary->replica: trim to here
-  eversion_t pg_trim_rollback_to;   // primary->replica: trim rollback
+  eversion_t pg_roll_forward_to;   // primary->replica: trim rollback
                                     // info to here
   osd_peer_stat_t peer_stat;
 
@@ -172,9 +172,9 @@ public:
       ::decode(updated_hit_set_history, p);
     }
     if (header.version >= 11) {
-      ::decode(pg_trim_rollback_to, p);
+      ::decode(pg_roll_forward_to, p);
     } else {
-      pg_trim_rollback_to = pg_trim_to;
+      pg_roll_forward_to = pg_trim_to;
     }
   }
 
@@ -234,7 +234,7 @@ public:
     ::encode(from, payload);
     ::encode(pgid.shard, payload);
     ::encode(updated_hit_set_history, payload);
-    ::encode(pg_trim_rollback_to, payload);
+    ::encode(pg_roll_forward_to, payload);
   }
 
   MOSDSubOp()