]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc: fix pgls_filter op encoding 5350/head
authorJohn Spray <john.spray@redhat.com>
Fri, 24 Jul 2015 13:46:49 +0000 (14:46 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 27 Jul 2015 08:21:17 +0000 (09:21 +0100)
This was broken with respect to the OSD's expected order
of decoding.

Signed-off-by: John Spray <john.spray@redhat.com>
src/osdc/Objecter.h

index 7c49efb95c14dd2123cee629923819c08c1e5ded..65a3569cc2940e8eefd582632f4ed95d716143f0 100644 (file)
@@ -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) {