From: Sage Weil <sage@redhat.com>
Date: Thu, 4 Jan 2018 18:53:39 +0000 (-0600)
Subject: osd: remove _ookup_lock_pg_with_map_lock_held()
X-Git-Tag: v13.1.0~390^2~99
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26938d54d46e8d0879f46907254f1cbfeb455f07;p=ceph.git

osd: remove _ookup_lock_pg_with_map_lock_held()

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f07266da06b6..e882f342c390 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3935,14 +3935,6 @@ PG *OSD::lookup_lock_pg(spg_t pgid)
   return _lookup_lock_pg(pgid);
 }
 
-PG *OSD::_lookup_lock_pg_with_map_lock_held(spg_t pgid)
-{
-  assert(pg_map.count(pgid));
-  PG *pg = pg_map[pgid];
-  pg->lock();
-  return pg;
-}
-
 void OSD::load_pgs()
 {
   assert(osd_lock.is_locked());
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index bac288101e2e..da17b9e85a1c 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1864,7 +1864,6 @@ protected:
   PGRecoveryStats pg_recovery_stats;
 
   PGRef _lookup_pg(spg_t pgid);
-  PG   *_lookup_lock_pg_with_map_lock_held(spg_t pgid);
   PG   *_lookup_lock_pg(spg_t pgid);
 
 public: