From: Chunmei Liu <chunmei.liu@intel.com>
Date: Wed, 5 Feb 2020 00:42:21 +0000 (-0800)
Subject: crimson: fix crimson pg coll usage error
X-Git-Tag: v15.1.1~552^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cdb08c26e5ec27fdc1c886cdc716e092b8a7d392;p=ceph-ci.git

crimson: fix crimson pg coll usage error

coll in pg isn't initialized, should use coll_ref->get_cid() insead.

Signed-off-by: Chunmei Liu <chunmei.liu@intel.com>
---

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index afacf0163cf..0dc06f561d0 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -285,13 +285,13 @@ void PG::prepare_write(pg_info_t &info,
     ceph_assert(ret == 0);
   }
   pglog.write_log_and_missing(
-    t, &km, coll, pgmeta_oid,
+    t, &km, coll_ref->get_cid(), pgmeta_oid,
     peering_state.get_pool().info.require_rollback());
   if (!km.empty()) {
-    t.omap_setkeys(coll, pgmeta_oid, km);
+    t.omap_setkeys(coll_ref->get_cid(), pgmeta_oid, km);
   }
   if (!key_to_remove.empty()) {
-    t.omap_rmkey(coll, pgmeta_oid, key_to_remove);
+    t.omap_rmkey(coll_ref->get_cid(), pgmeta_oid, key_to_remove);
   }
 }
 
diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index d303745c544..0a199e5473c 100644
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -60,7 +60,6 @@ class PG : public boost::intrusive_ref_counter<
 
   spg_t pgid;
   pg_shard_t pg_whoami;
-  coll_t coll;
   crimson::os::CollectionRef coll_ref;
   ghobject_t pgmeta_oid;
 public: