From: Sage Weil <sage@redhat.com>
Date: Fri, 9 Feb 2018 22:15:00 +0000 (-0600)
Subject: osd: kill pass-through _open_pg
X-Git-Tag: v13.1.0~390^2~56
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1270b49fb5f2b46837453816e64c96f8ed6cacde;p=ceph.git

osd: kill pass-through _open_pg

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bcc2800b8bc..3014753b525 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3641,14 +3641,6 @@ void OSD::recursive_remove_collection(CephContext* cct,
 // ======================================================
 // PG's
 
-PGRef OSD::_open_pg(
-  OSDMapRef createmap,
-  spg_t pgid)
-{
-  PGRef pg = _make_pg(createmap, pgid);
-  return pg;
-}
-
 PG* OSD::_make_pg(
   OSDMapRef createmap,
   spg_t pgid)
@@ -3829,9 +3821,9 @@ void OSD::load_pgs()
 	  assert(0 == "Missing map in load_pgs");
 	}
       }
-      pg = _open_pg(pgosdmap, pgid);
+      pg = _make_pg(pgosdmap, pgid);
     } else {
-      pg = _open_pg(osdmap, pgid);
+      pg = _make_pg(osdmap, pgid);
     }
     // there can be no waiters here, so we don't call wake_pg_waiters
 
@@ -3905,7 +3897,7 @@ PGRef OSD::handle_pg_create_info(OSDMapRef osdmap, const PGCreateInfo *info)
     role = -1;
   }
 
-  PGRef pg = _open_pg(createmap, pgid);
+  PGRef pg = _make_pg(createmap, pgid);
   pg->ch = store->create_new_collection(pg->coll);
 
   pg->lock(true);
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 97884673602..f8707379168 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1811,10 +1811,6 @@ public:
   PG   *lookup_lock_pg(spg_t pgid);
 
 protected:
-  PGRef _open_pg(
-    OSDMapRef createmap,   ///< map pg is created in
-    spg_t pg);
-
   PG* _make_pg(OSDMapRef createmap, spg_t pgid);
 
   bool maybe_wait_for_max_pg(OSDMapRef osdmap, spg_t pgid, bool is_mon_create);