osd/osd_types.h: fix pg_history_t::merge copy paste error

CID 716882: Copy-paste error (COPY_PASTE_ERROR)At (2): "last_epoch_started" in
"other.last_epoch_started" looks like a copy-paste error. Should it say
"last_epoch_split" instead?

From what I can tell, this really should be checking other.last_epoch_split
rather than other.last_epoch_started.

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index f909dc599181b71c420a249486ffda365f479c29..cdbdfa957048cbee6eb8674dad85e541eb23dd57 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -1360,7 +1360,7 @@ void pg_notify_t::generate_test_instances(list<pg_notify_t*>& o)
   o.push_back(new pg_notify_t(3,10,pg_info_t()));
 }
 
-ostream &operator<<(ostream &lhs, const pg_notify_t notify)
+ostream &operator<<(ostream &lhs, const pg_notify_t &notify)
 {
   return lhs << "(query_epoch:" << notify.query_epoch
             << ", epoch_sent:" << notify.epoch_sent

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 97c86587555ac7a5c3859dee9879fd99e20e1ce9..7cb590bdea68002416215ef1abb3e1f6e2e8e595 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -973,8 +973,8 @@ struct pg_history_t {
       last_epoch_clean = other.last_epoch_clean;
       modified = true;
     }
-    if (last_epoch_split < other.last_epoch_started) {
-      last_epoch_split = other.last_epoch_started; 
+    if (last_epoch_split < other.last_epoch_split) {
+      last_epoch_split = other.last_epoch_split; 
       modified = true;
     }
     if (other.last_scrub > last_scrub) {
@@ -1085,7 +1085,7 @@ struct pg_notify_t {
   static void generate_test_instances(list<pg_notify_t*> &o);
 };
 WRITE_CLASS_ENCODER(pg_notify_t)
-ostream &operator<<(ostream &lhs, const pg_notify_t notify);
+ostream &operator<<(ostream &lhs, const pg_notify_t &notify);
 
 
 /**