From: Adam C. Emerson <aemerson@redhat.com>
Date: Mon, 7 May 2018 17:41:31 +0000 (-0400)
Subject: cleanup: Remove unused variables/captures
X-Git-Tag: v14.0.0~163^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33c8a43d6d3a2688ac1cfdc14695eabcb90e0c58;p=ceph.git

cleanup: Remove unused variables/captures

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index c2627c07601..820b961b035 100644
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -815,7 +815,7 @@ void ConfigMonitor::check_sub(Subscription *sub)
   if (sub->next <= version) {
     maybe_send_config(sub->session);
     if (sub->onetime) {
-      mon->with_session_map([this, sub](MonSessionMap& session_map) {
+      mon->with_session_map([sub](MonSessionMap& session_map) {
 	  session_map.remove_sub(sub);
 	});
     } else {
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 993913d00e4..5cc4104f26a 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -606,7 +606,6 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
           info.standby_for_name);
       if (leaderinfo && (leaderinfo->rank >= 0)) {
         const auto &fscid = pending.mds_roles.at(leaderinfo->global_id);
-        const auto &fs = pending.get_filesystem(fscid);
 
         pending.modify_daemon(gid, [fscid, leaderinfo](
               MDSMap::mds_info_t *info) {
diff --git a/src/test/librbd/test_mock_ManagedLock.cc b/src/test/librbd/test_mock_ManagedLock.cc
index 1a841b4c690..d6b8f595563 100644
--- a/src/test/librbd/test_mock_ManagedLock.cc
+++ b/src/test/librbd/test_mock_ManagedLock.cc
@@ -208,7 +208,7 @@ public:
                         MockMockManagedLock &managed_lock, uint64_t &client_id) {
     expect_get_watch_handle(watcher);
     EXPECT_CALL(managed_lock, post_reacquire_lock_handler(_, _))
-      .WillOnce(Invoke([&watcher, &client_id](int r, Context *on_finish){
+      .WillOnce(Invoke([&client_id](int r, Context *on_finish){
         if (r >= 0) {
           client_id = 98765;
         }
diff --git a/src/test/mon/test_mon_types.cc b/src/test/mon/test_mon_types.cc
index 3ffb49dbccd..e9997f14f2e 100644
--- a/src/test/mon/test_mon_types.cc
+++ b/src/test/mon/test_mon_types.cc
@@ -76,7 +76,6 @@ TEST(mon_features, binary_ops) {
 
 TEST(mon_features, set_funcs) {
 
-  mon_feature_t FEATURE_NONE(0ULL);
   mon_feature_t FEATURE_A((1ULL << 1));
   mon_feature_t FEATURE_B((1ULL << 2));
   mon_feature_t FEATURE_C((1ULL << 3));
diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc
index 90d04868a4a..8f13b4f4e14 100644
--- a/src/tools/rbd_mirror/PoolReplayer.cc
+++ b/src/tools/rbd_mirror/PoolReplayer.cc
@@ -740,7 +740,7 @@ void PoolReplayer<I>::handle_init_image_map(int r, Context *on_finish) {
   dout(5) << "r=" << r << dendl;
   if (r < 0) {
     derr << "failed to init image map: " << cpp_strerror(r) << dendl;
-    on_finish = new FunctionContext([this, on_finish, r](int) {
+    on_finish = new FunctionContext([on_finish, r](int) {
         on_finish->complete(r);
       });
     shut_down_image_map(on_finish);
@@ -774,7 +774,7 @@ void PoolReplayer<I>::handle_init_local_pool_watcher(
   dout(10) << "r=" << r << dendl;
   if (r < 0) {
     derr << "failed to retrieve local images: " << cpp_strerror(r) << dendl;
-    on_finish = new FunctionContext([this, on_finish, r](int) {
+    on_finish = new FunctionContext([on_finish, r](int) {
         on_finish->complete(r);
       });
     shut_down_pool_watchers(on_finish);
@@ -806,7 +806,7 @@ void PoolReplayer<I>::handle_init_remote_pool_watcher(
   dout(10) << "r=" << r << dendl;
   if (r < 0) {
     derr << "failed to retrieve remote images: " << cpp_strerror(r) << dendl;
-    on_finish = new FunctionContext([this, on_finish, r](int) {
+    on_finish = new FunctionContext([on_finish, r](int) {
         on_finish->complete(r);
       });
     shut_down_pool_watchers(on_finish);
@@ -837,7 +837,7 @@ void PoolReplayer<I>::handle_init_image_deleter(int r, Context *on_finish) {
   dout(10) << "r=" << r << dendl;
   if (r < 0) {
     derr << "failed to init image deleter: " << cpp_strerror(r) << dendl;
-    on_finish = new FunctionContext([this, on_finish, r](int) {
+    on_finish = new FunctionContext([on_finish, r](int) {
         on_finish->complete(r);
       });
     shut_down_image_deleter(on_finish);