From 6e039e58d71a201a1fbbee1d1ffb0e635f5f9c70 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Tue, 9 Jan 2018 14:54:11 -0500 Subject: [PATCH] {common,mds,rbd}: Fix unused lambda capture warnings Signed-off-by: Adam C. Emerson --- src/common/iso_8601.cc | 2 +- src/mds/MDSRank.cc | 4 ++-- src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc | 2 +- src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc | 2 +- src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc | 2 +- src/test/librbd/test_mock_ObjectMap.cc | 2 +- src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc | 2 +- src/test/rbd_mirror/test_mock_ImageReplayer.cc | 2 +- src/test/rbd_mirror/test_mock_LeaderWatcher.cc | 2 +- src/test/rbd_mirror/test_mock_PoolWatcher.cc | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/iso_8601.cc b/src/common/iso_8601.cc index 8a8e37259ff..29cfd4b4737 100644 --- a/src/common/iso_8601.cc +++ b/src/common/iso_8601.cc @@ -59,7 +59,7 @@ optional 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 4b9732fd3d3..690d44e5658 100644 --- 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 fn){ + auto background_blacklist = [this, cmd](std::function 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 c46cc9e373b..3daf3ba581d 100644 --- 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( diff --git a/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc index ffed8f3f656..805003e7f51 100644 --- 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 f12a48c31c7..b43a338baee 100644 --- 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 7deaef03bb8..59f21ea4316 100644 --- 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 d23bc4c6f65..d135ede7097 100644 --- 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 2b71b6e33ba..2d510352ce4 100644 --- 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 2141a00f7a0..3dc62fe8115 100644 --- a/src/test/rbd_mirror/test_mock_LeaderWatcher.cc +++ b/src/test/rbd_mirror/test_mock_LeaderWatcher.cc @@ -108,7 +108,7 @@ struct ManagedLock { }); 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 d6545d5fa49..3300c63ceb6 100644 --- 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))); -- 2.39.5