From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Sep 2015 20:21:07 +0000 (-0400)
Subject: Merge pull request #5442 from ceph/wip-12551
X-Git-Tag: v9.1.0~176
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f74c60f429f26c1cd55e219642fa19cb5a803468;p=ceph.git

Merge pull request #5442 from ceph/wip-12551

ReplicatedPG,Objecter: copy_get should include truncate_seq and size

Reviewed-by: Sage Weil <sage@redhat.com>
---

f74c60f429f26c1cd55e219642fa19cb5a803468
diff --cc src/osdc/Objecter.h
index d4d269dfc4f,038e5f3b6e6..1a985789955
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@@ -652,10 -656,12 +656,13 @@@ struct ObjectOperation 
  	out_attrs(a), out_data(d), out_omap_header(oh),
  	out_omap_data(o), out_snaps(osnaps), out_snap_seq(osnap_seq),
  	out_flags(flags), out_data_digest(dd), out_omap_digest(od),
-         out_reqids(oreqids), prval(r) {}
+         out_reqids(oreqids),
+         out_truncate_seq(otseq),
+         out_truncate_size(otsize),
+         prval(r) {}
      void finish(int r) {
 -      if (r < 0)
 +      // reqids are copied on ENOENT
 +      if (r < 0 && r != -ENOENT)
  	return;
        try {
  	bufferlist::iterator p = bl.begin();