]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: use explicit ghobject_t ctor for reading hitsets
authorSage Weil <sage@redhat.com>
Thu, 18 Jun 2015 23:04:52 +0000 (16:04 -0700)
committerSage Weil <sage@redhat.com>
Fri, 19 Jun 2015 00:37:58 +0000 (17:37 -0700)
Non-ec only, so it's safe.

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

index 5bea58f6bba1f86039aaf603b10e2ec18549b19a..868c251686c729ac96e5baed4f8bbea8dbc2e385 100644 (file)
@@ -1149,7 +1149,7 @@ void ReplicatedPG::do_pg_op(OpRequestRef op)
            wait_for_unreadable_object(oid, op);
            return;
          }
-         result = osd->store->read(coll, oid, 0, 0, osd_op.outdata);
+         result = osd->store->read(coll, ghobject_t(oid), 0, 0, osd_op.outdata);
        }
       }
       break;
@@ -10770,7 +10770,7 @@ void ReplicatedPG::agent_load_hit_sets()
        bufferlist bl;
        {
          obc->ondisk_read_lock();
-         int r = osd->store->read(coll, oid, 0, 0, bl);
+         int r = osd->store->read(coll, ghobject_t(oid), 0, 0, bl);
          assert(r >= 0);
          obc->ondisk_read_unlock();
        }