osd: kill _open_lock_pg

Move lock call to caller.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3fe8aca6d0e1611d1f99472fb91d6a32d2d847cb..7a3aa8ca36da3690933e9330ca9d6cbbb8d7bbc2 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3828,16 +3828,6 @@ PGRef OSD::_open_pg(
   return pg;
 }
 
-PG *OSD::_open_lock_pg(
-  OSDMapRef createmap,
-  OSDMapRef servicemap,
-  spg_t pgid, bool no_lockdep_check)
-{
-  PGRef pg = _open_pg(createmap, servicemap, pgid);
-  pg->lock();
-  return pg.get();
-}
-
 PG* OSD::_make_pg(
   OSDMapRef createmap,
   spg_t pgid)
@@ -3985,12 +3975,13 @@ void OSD::load_pgs()
          assert(0 == "Missing map in load_pgs");
        }
       }
-      pg = _open_lock_pg(pgosdmap, osdmap, pgid);
+      pg = _open_pg(pgosdmap, osdmap, pgid);
     } else {
-      pg = _open_lock_pg(osdmap, osdmap, pgid);
+      pg = _open_pg(osdmap, osdmap, pgid);
     }
     // there can be no waiters here, so we don't call wake_pg_waiters
 
+    pg->lock();
     pg->ch = store->open_collection(pg->coll);
 
     // read pg state, log

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index efd5db4417f0f0818a50c07bade16127fdbc5c61..30ab8eec00f270944af18808e1eed9b4736a5187 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1882,11 +1882,6 @@ protected:
     OSDMapRef createmap,   ///< map pg is created in
     OSDMapRef servicemap,  ///< latest service map
     spg_t pg);
-  PG *_open_lock_pg(
-    OSDMapRef createmap,
-    OSDMapRef servicemap,
-    spg_t pg,
-    bool no_lockdep_check=false);
 
   PG* _make_pg(OSDMapRef createmap, spg_t pgid);