From: Samuel Just Date: Thu, 30 Aug 2012 00:00:43 +0000 (-0700) Subject: osd/osd_types.h: fix pg_history_t::merge copy paste error X-Git-Tag: v0.53~229^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd4d567bf9f45e2ee420fba63439a512a6e7fee4;p=ceph.git 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 --- diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index f909dc599181..cdbdfa957048 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -1360,7 +1360,7 @@ void pg_notify_t::generate_test_instances(list& 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 ¬ify) { 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 97c86587555a..7cb590bdea68 100644 --- 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 &o); }; WRITE_CLASS_ENCODER(pg_notify_t) -ostream &operator<<(ostream &lhs, const pg_notify_t notify); +ostream &operator<<(ostream &lhs, const pg_notify_t ¬ify); /**