]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: pass extra_ops of read_full into read func.
authorJianpeng Ma <jianpeng.ma@intel.com>
Fri, 21 Aug 2015 06:08:52 +0000 (14:08 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Fri, 11 Sep 2015 05:07:33 +0000 (13:07 +0800)
We don't know extra_ops whether null, so pass it to read func is good
method.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osdc/Objecter.h

index 34adc43a42635798b7b02715ddabecca5357482d..f865c4eb151d25ff4b3ad169ddfd36e76c84bc4b 100644 (file)
@@ -2299,7 +2299,8 @@ public:
                  snapid_t snap, bufferlist *pbl, int flags,
                  Context *onfinish,
                  version_t *objver = NULL, ObjectOperation *extra_ops = NULL) {
-    return read(oid, oloc, 0, 0, snap, pbl, flags | global_op_flags.read() | CEPH_OSD_FLAG_READ, onfinish, objver);
+    return read(oid, oloc, 0, 0, snap, pbl, flags | global_op_flags.read() | CEPH_OSD_FLAG_READ,
+               onfinish, objver, extra_ops);
   }