From d844060b59bfb70b32c290b347d858ce00662dda Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Jun 2015 16:03:50 -0700 Subject: [PATCH] osd/ReplicatedPG: use ghobject_t ctor for fiemap These are non-EC only, so it's safe. Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 02ac024cb3241..5bea58f6bba1f 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3511,7 +3511,9 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& 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& 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; -- 2.39.5