From: chunmei-liu Date: Wed, 16 Feb 2022 05:06:24 +0000 (-0800) Subject: crimson: eliminate clang build warning in crimson X-Git-Tag: v18.0.0~1372^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45049%2Fhead;p=ceph.git crimson: eliminate clang build warning in crimson Signed-off-by: chunmei-liu --- diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc b/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc index 9bea6b596ab9..6b7078713f30 100644 --- a/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc +++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc @@ -593,6 +593,7 @@ LBABtree::find_insertion_ret LBABtree::find_insertion( return iter.prev( c ).si_then([laddr, &iter](auto p) { + boost::ignore_unused(laddr); // avoid clang warning; assert(p.leaf.node->get_node_meta().begin <= laddr); assert(p.get_key() < laddr); // Note, this is specifically allowed to violate the iterator diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc index 64f72b1592fc..bf782fdb1f30 100644 --- a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc +++ b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc @@ -226,6 +226,7 @@ OMapInnerNode::list( start, config.with_reduced_max(result.size()) ).si_then([&, config](auto &&child_ret) mutable { + boost::ignore_unused(config); // avoid clang warning; auto &[child_complete, child_result] = child_ret; if (result.size() && child_result.size()) { assert(child_result.begin()->first > result.rbegin()->first); diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h index 379583523d80..aae6018074be 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h @@ -570,6 +570,7 @@ class NodeExtentAccessorT { }) ); }).si_then([this, c] { + boost::ignore_unused(c); // avoid clang warning; assert(!c.t.is_conflicted()); return *mut; }); diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h b/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h index ad60f5c6e2d4..87fd4584d7df 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h @@ -309,6 +309,7 @@ class TreeBuilder { return tree->insert( t, p_kv->key, {p_kv->value.get_payload_size()} ).si_then([&t, this, p_kv](auto ret) { + boost::ignore_unused(this); // avoid clang warning; auto success = ret.second; auto cursor = std::move(ret.first); initialize_cursor_from_item(t, p_kv->key, p_kv->value, cursor, success); @@ -401,6 +402,9 @@ class TreeBuilder { p_kv->value); return tree->erase(t, p_kv->key ).si_then([&t, this, p_kv] (auto size) { + boost::ignore_unused(t); // avoid clang warning; + boost::ignore_unused(this); + boost::ignore_unused(p_kv); ceph_assert(size == 1); #ifndef NDEBUG return tree->contains(t, p_kv->key diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc index 2702e4973097..7c72014d0cb4 100644 --- a/src/crimson/os/seastore/seastore.cc +++ b/src/crimson/os/seastore/seastore.cc @@ -159,7 +159,9 @@ SeaStore::mount_ertr::future<> SeaStore::mount() oss << root << "/block." << dtype << "." << std::to_string(id); auto sm = std::make_unique< segment_manager::block::BlockSegmentManager>(oss.str()); - return sm->mount().safe_then([this, sm=std::move(sm), magic]() mutable { + return sm->mount().safe_then( + [this, sm=std::move(sm), magic]() mutable { + boost::ignore_unused(magic); // avoid clang warning; assert(sm->get_magic() == magic); transaction_manager->add_segment_manager(sm.get()); secondaries.emplace_back(std::move(sm)); diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h index 596bc552b578..c247acdb6b5f 100644 --- a/src/crimson/os/seastore/seastore_types.h +++ b/src/crimson/os/seastore/seastore_types.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "include/byteorder.h" #include "include/denc.h" diff --git a/src/crimson/tools/store_nbd/fs_driver.cc b/src/crimson/tools/store_nbd/fs_driver.cc index ee0d4f6a05f8..f7a33b38510c 100644 --- a/src/crimson/tools/store_nbd/fs_driver.cc +++ b/src/crimson/tools/store_nbd/fs_driver.cc @@ -182,7 +182,6 @@ seastar::future<> FSDriver::mkfs() return init( ).then([this] { assert(fs); - }).then([this] { return fs->start(); }).then([this] { uuid_d uuid; diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc index 19cbd56e5e62..2ccb48b25ff9 100644 --- a/src/crimson/tools/store_nbd/tm_driver.cc +++ b/src/crimson/tools/store_nbd/tm_driver.cc @@ -36,6 +36,7 @@ seastar::future<> TMDriver::write( logger().debug("dec_ref complete"); return tm->alloc_extent(t, offset, ptr.length()); }).si_then([this, offset, &t, &ptr](auto ext) { + boost::ignore_unused(offset); // avoid clang warning; assert(ext->get_laddr() == (size_t)offset); assert(ext->get_bptr().length() == ptr.length()); ext->get_bptr().swap(ptr);