From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Fri, 10 Jan 2020 06:59:08 +0000 (+0800)
Subject: osd/OSD: remove unused parameter osdmap_lock_name.
X-Git-Tag: v15.1.0~264^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c56108b561977cbf277c357e2bee1c1ce7136198;p=ceph-ci.git

osd/OSD: remove unused parameter osdmap_lock_name.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index fdd04b860f8..dd1968db542 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -10340,8 +10340,7 @@ OSDShard::OSDShard(
     shard_name(string("OSDShard.") + stringify(id)),
     sdata_wait_lock_name(shard_name + "::sdata_wait_lock"),
     sdata_wait_lock{make_mutex(sdata_wait_lock_name)},
-    osdmap_lock_name(shard_name + "::osdmap_lock"),
-    osdmap_lock{make_mutex(osdmap_lock_name)},
+    osdmap_lock{make_mutex(shard_name + "::osdmap_lock")},
     shard_lock_name(shard_name + "::shard_lock"),
     shard_lock{make_mutex(shard_lock_name)},
     scheduler(ceph::osd::scheduler::make_scheduler(cct)),
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 25e2a8eb9bd..81f50c3e88e 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1000,7 +1000,6 @@ struct OSDShard {
   ceph::mutex sdata_wait_lock;
   ceph::condition_variable sdata_cond;
 
-  string osdmap_lock_name;
   ceph::mutex osdmap_lock;  ///< protect shard_osdmap updates vs users w/o shard_lock
   OSDMapRef shard_osdmap;