]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
remove unused hold_map_lock in _open_lock_pg 3378/head
authorxinxin shu <xinxin.shu@intel.com>
Thu, 15 Jan 2015 04:47:07 +0000 (12:47 +0800)
committerxinxin shu <xinxin.shu@intel.com>
Thu, 15 Jan 2015 04:47:07 +0000 (12:47 +0800)
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
src/osd/OSD.cc
src/osd/OSD.h

index bc56c7c7f75309336ca2dd4992f984d99abdd95d..57dd9c8b3c50b05aa21677d34b2f749c6d79e0e0 100644 (file)
@@ -2485,7 +2485,7 @@ PGPool OSD::_get_pool(int id, OSDMapRef createmap)
 
 PG *OSD::_open_lock_pg(
   OSDMapRef createmap,
-  spg_t pgid, bool no_lockdep_check, bool hold_map_lock)
+  spg_t pgid, bool no_lockdep_check)
 {
   assert(osd_lock.is_locked());
 
@@ -2624,7 +2624,7 @@ PG *OSD::_create_lock_pg(
   assert(osd_lock.is_locked());
   dout(20) << "_create_lock_pg pgid " << pgid << dendl;
 
-  PG *pg = _open_lock_pg(createmap, pgid, true, hold_map_lock);
+  PG *pg = _open_lock_pg(createmap, pgid, true);
 
   service.init_splits_between(pgid, pg->get_osdmap(), service.get_osdmap());
 
index 5638f39b6a917b8ff36046698d0127a6a1c71391..6c8663ccd4a54aa0eb77159ae9ccbdc09a7a398c 100644 (file)
@@ -1682,8 +1682,7 @@ protected:
   PG   *_lookup_lock_pg(spg_t pgid);
   PG   *_lookup_pg(spg_t pgid);
   PG   *_open_lock_pg(OSDMapRef createmap,
-                     spg_t pg, bool no_lockdep_check=false,
-                     bool hold_map_lock=false);
+                     spg_t pg, bool no_lockdep_check=false);
   enum res_result {
     RES_PARENT,    // resurrected a parent
     RES_SELF,      // resurrected self