From: John Spray <john.spray@redhat.com>
Date: Fri, 24 Jul 2015 13:46:49 +0000 (+0100)
Subject: osdc: fix pgls_filter op encoding
X-Git-Tag: v9.0.3~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2fe6bd3d49c7d54fd7e52605f1f35ef3df7516a7;p=ceph.git

osdc: fix pgls_filter op encoding

This was broken with respect to the OSD's expected order
of decoding.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 7c49efb95c14..65a3569cc294 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -194,8 +194,8 @@ struct ObjectOperation {
     string mname = "filter";
     ::encode(cname, osd_op.indata);
     ::encode(mname, osd_op.indata);
-    ::encode(cookie, osd_op.indata);
     osd_op.indata.append(filter);
+    ::encode(cookie, osd_op.indata);
   }
   void add_alloc_hint(int op, uint64_t expected_object_size,
                       uint64_t expected_write_size) {