From: Samuel Just <sam.just@inktank.com>
Date: Tue, 4 Mar 2014 17:16:08 +0000 (-0800)
Subject: ECMsgTypes: fix constructor temp_added/temp_removed ordering to match users
X-Git-Tag: v0.78~90^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=308ea1bd9e30300827d42ab6087dac8630b2da95;p=ceph.git

ECMsgTypes: fix constructor temp_added/temp_removed ordering to match users

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

diff --git a/src/osd/ECMsgTypes.h b/src/osd/ECMsgTypes.h
index 8b8f046d230b..cadeb2540174 100644
--- a/src/osd/ECMsgTypes.h
+++ b/src/osd/ECMsgTypes.h
@@ -29,8 +29,8 @@ struct ECSubWrite {
  eversion_t at_version;
   eversion_t trim_to;
   vector<pg_log_entry_t> log_entries;
-  set<hobject_t> temp_removed;
   set<hobject_t> temp_added;
+  set<hobject_t> temp_removed;
   ECSubWrite() {}
   ECSubWrite(
     pg_shard_t from,
@@ -42,14 +42,14 @@ struct ECSubWrite {
     eversion_t at_version,
     eversion_t trim_to,
     vector<pg_log_entry_t> log_entries,
-    const set<hobject_t> &temp_removed,
-    const set<hobject_t> &temp_added)
+    const set<hobject_t> &temp_added,
+    const set<hobject_t> &temp_removed)
     : from(from), tid(tid), reqid(reqid),
       soid(soid), stats(stats), t(t),
       at_version(at_version),
       trim_to(trim_to), log_entries(log_entries),
-      temp_removed(temp_removed),
-      temp_added(temp_added) {}
+      temp_added(temp_added),
+      temp_removed(temp_removed) {}
   void encode(bufferlist &bl) const;
   void decode(bufferlist::iterator &bl);
   void dump(Formatter *f) const;