From: xinxin shu Date: Thu, 15 Jan 2015 04:47:07 +0000 (+0800) Subject: remove unused hold_map_lock in _open_lock_pg X-Git-Tag: v0.93~280^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d532f3ed2ebccba4e6ef19f07e2f975c074a5ecc;p=ceph.git remove unused hold_map_lock in _open_lock_pg Signed-off-by: xinxin shu --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index bc56c7c7f753..57dd9c8b3c50 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -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()); diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 5638f39b6a91..6c8663ccd4a5 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -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