]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: use ghobject_t ctor for fiemap
authorSage Weil <sage@redhat.com>
Thu, 18 Jun 2015 23:03:50 +0000 (16:03 -0700)
committerSage Weil <sage@redhat.com>
Fri, 19 Jun 2015 00:37:58 +0000 (17:37 -0700)
These are non-EC only, so it's safe.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/ReplicatedPG.cc

index 02ac024cb3241433ea6f8d1c9b29ed40322236d6..5bea58f6bba1f86039aaf603b10e2ec18549b19a 100644 (file)
@@ -3511,7 +3511,9 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
       {
        // read into a buffer
        bufferlist bl;
-       int r = osd->store->fiemap(coll, soid, op.extent.offset, op.extent.length, bl);
+       int r = osd->store->fiemap(coll, ghobject_t(soid, ghobject_t::NO_GEN,
+                                                   info.pgid.shard),
+                                  op.extent.offset, op.extent.length, bl);
        osd_op.outdata.claim(bl);
        if (r < 0)
          result = r;
@@ -3539,7 +3541,9 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
        // read into a buffer
        bufferlist bl;
         int total_read = 0;
-       int r = osd->store->fiemap(coll, soid, op.extent.offset, op.extent.length, bl);
+       int r = osd->store->fiemap(coll, ghobject_t(soid, ghobject_t::NO_GEN,
+                                                   info.pgid.shard),
+                                  op.extent.offset, op.extent.length, bl);
        if (r < 0)  {
          result = r;
           break;