{common,mds,rbd}: Fix unused lambda capture warnings

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

diff --git a/src/common/iso_8601.cc b/src/common/iso_8601.cc
index 8a8e37259ff1999cd531f597cbb4631e8019d852..29cfd4b4737f4d0b892837084f48e34f3a157697 100644 (file)
--- a/src/common/iso_8601.cc
+++ b/src/common/iso_8601.cc
@@ -59,7 +59,7 @@ optional<real_time> from_iso_8601(const string_ref s,
     return f;
   };
 
-  auto read_digits = [end, &read_digit](sriter& c, std::size_t n) {
+  auto read_digits = [&read_digit](sriter& c, std::size_t n) {
     auto v = 0ULL;
     for (auto i = 0U; i < n; ++i) {
       auto d = read_digit(c);

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 4b9732fd3d3755f11e937619134cf2b1b29b2bef..690d44e56581fbfd12878b57e7b198ee24f2f9ad 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -2737,10 +2737,10 @@ bool MDSRank::evict_client(int64_t session_id,
     }
   };
 
-  auto background_blacklist = [this, session_id, cmd](std::function<void ()> fn){
+  auto background_blacklist = [this, cmd](std::function<void ()> fn){
     assert(mds_lock.is_locked_by_me());
 
-    Context *on_blacklist_done = new FunctionContext([this, session_id, fn](int r) {
+    Context *on_blacklist_done = new FunctionContext([this, fn](int r) {
       objecter->wait_for_latest_osdmap(
        new C_OnFinisher(
          new FunctionContext([this, fn](int r) {

diff --git a/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc
index c46cc9e373b30d8baa9adec0cc1505af20002a06..3daf3ba581d219382de7a596206b103859e18e60 100644 (file)
--- a/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc
+++ b/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc
@@ -251,7 +251,7 @@ public:
                                 })),
                               Return(true)));
       } else {
-        expect.WillOnce(DoAll(WithArg<6>(Invoke([&mock_image_ctx, snap_id, state, r](Context *ctx) {
+        expect.WillOnce(DoAll(WithArg<6>(Invoke([&mock_image_ctx, snap_id, state](Context *ctx) {
                                   assert(mock_image_ctx.image_ctx->snap_lock.is_locked());
                                   assert(mock_image_ctx.image_ctx->object_map_lock.is_wlocked());
                                   mock_image_ctx.image_ctx->object_map->aio_update<Context>(

diff --git a/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc
index ffed8f3f656eca75a81b10930fdaee6997f388b6..805003e7f51f1ebd4bc8f8baef028bbdcce803ee 100644 (file)
--- a/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc
+++ b/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc
@@ -207,7 +207,7 @@ public:
 
   void expect_set_head(MockSetHeadRequest &mock_set_head_request, int r) {
     EXPECT_CALL(mock_set_head_request, send())
-      .WillOnce(Invoke([this, &mock_set_head_request, r]() {
+      .WillOnce(Invoke([&mock_set_head_request, r]() {
             mock_set_head_request.on_finish->complete(r);
           }));
   }

diff --git a/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc b/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc
index f12a48c31c7dc32a26c6725818c99a5046ef71a5..b43a338baee6dcb079243b554bef92a6b17a8f22 100644 (file)
--- a/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc
+++ b/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc
@@ -101,7 +101,7 @@ public:
 
   void expect_set_head(MockSetHeadRequest &mock_set_head_request, int r) {
     EXPECT_CALL(mock_set_head_request, send())
-      .WillOnce(Invoke([this, &mock_set_head_request, r]() {
+      .WillOnce(Invoke([&mock_set_head_request, r]() {
             mock_set_head_request.on_finish->complete(r);
           }));
   }

diff --git a/src/test/librbd/test_mock_ObjectMap.cc b/src/test/librbd/test_mock_ObjectMap.cc
index 7deaef03bb8ea6cf587ccd6851394ada9d9d22a1..59f21ea4316037ce348e3571bd5ed63b8cdf2e42 100644 (file)
--- a/src/test/librbd/test_mock_ObjectMap.cc
+++ b/src/test/librbd/test_mock_ObjectMap.cc
@@ -139,7 +139,7 @@ public:
                                                current_state))
       .Times(1);
     EXPECT_CALL(mock_update_request, send())
-      .WillOnce(Invoke([&mock_image_ctx, &mock_update_request, on_finish]() {
+      .WillOnce(Invoke([&mock_update_request, on_finish]() {
           *on_finish = mock_update_request.on_finish;
         }));
   }

diff --git a/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc b/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc
index d23bc4c6f65592547c501179f2bfab0a266c172c..d135ede7097e81a9c3584bf7995348bbbc48b739 100644 (file)
--- a/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc
+++ b/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc
@@ -169,7 +169,7 @@ public:
     EXPECT_CALL(get_mock_io_ctx(io_ctx),
                 exec(RBD_TRASH, _, StrEq("rbd"), StrEq("trash_list"),
                      ContentsEqual(bl), _, _))
-      .WillOnce(DoAll(WithArg<5>(Invoke([this, out_bl](bufferlist *bl) {
+      .WillOnce(DoAll(WithArg<5>(Invoke([out_bl](bufferlist *bl) {
                           *bl = out_bl;
                         })),
                       Return(r)));

diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
index 2b71b6e33bab3e3c9d75028619b75a792cba0ceb..2d510352ce460a3f41566c41d655b2052d639a2f 100644 (file)
--- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
@@ -397,7 +397,7 @@ public:
                          bool ignore_orphan, int r) {
     EXPECT_CALL(mock_image_deleter,
                 trash_move(global_image_id, ignore_orphan, _))
-      .WillOnce(WithArg<2>(Invoke([this, &mock_image_deleter, r](Context* ctx) {
+      .WillOnce(WithArg<2>(Invoke([this, r](Context* ctx) {
                              m_threads->work_queue->queue(ctx, r);
                            })));
   }

diff --git a/src/test/rbd_mirror/test_mock_LeaderWatcher.cc b/src/test/rbd_mirror/test_mock_LeaderWatcher.cc
index 2141a00f7a01d3d9df43240a5dca228b155056ba..3dc62fe81151a8211cfbbd159cf14f6a3661e9f3 100644 (file)
--- a/src/test/rbd_mirror/test_mock_LeaderWatcher.cc
+++ b/src/test/rbd_mirror/test_mock_LeaderWatcher.cc
@@ -108,7 +108,7 @@ struct ManagedLock<MockTestImageCtx> {
       });
 
     Context *release_ctx = new FunctionContext(
-      [this, on_released, post_release_ctx](int r) {
+      [on_released, post_release_ctx](int r) {
         if (r < 0) {
           on_released->complete(r);
         } else {

diff --git a/src/test/rbd_mirror/test_mock_PoolWatcher.cc b/src/test/rbd_mirror/test_mock_PoolWatcher.cc
index d6545d5fa498b13b2c5d20610b33bfbc85eca8a6..3300c63ceb6a62100f400a4ca94ee19ac3f72f75 100644 (file)
--- a/src/test/rbd_mirror/test_mock_PoolWatcher.cc
+++ b/src/test/rbd_mirror/test_mock_PoolWatcher.cc
@@ -231,7 +231,7 @@ public:
     EXPECT_CALL(get_mock_io_ctx(io_ctx),
                 exec(RBD_MIRRORING, _, StrEq("rbd"), StrEq("mirror_uuid_get"),
                      _, _, _))
-      .WillOnce(DoAll(WithArg<5>(Invoke([this, out_bl](bufferlist *bl) {
+      .WillOnce(DoAll(WithArg<5>(Invoke([out_bl](bufferlist *bl) {
                           *bl = out_bl;
                         })),
                       Return(r)));