From f9629788846404858654c4111cb31954477cd84e Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Mon, 26 Apr 2021 15:01:54 +0800 Subject: [PATCH] crimson/seastore: switch tab mode of OnodeManager files to nil Signed-off-by: Yingxin Cheng --- src/crimson/os/seastore/onode.cc | 6 +-- src/crimson/os/seastore/onode.h | 2 +- src/crimson/os/seastore/onode_manager.h | 2 +- .../staged-fltree/fltree_onode_manager.cc | 46 +++++++++---------- .../staged-fltree/fltree_onode_manager.h | 4 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/crimson/os/seastore/onode.cc b/src/crimson/os/seastore/onode.cc index d269f7760c3..96b69fb7c30 100644 --- a/src/crimson/os/seastore/onode.cc +++ b/src/crimson/os/seastore/onode.cc @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- // vim: ts=8 sw=2 smarttab #include "onode.h" @@ -10,8 +10,8 @@ std::ostream& operator<<(std::ostream &out, const Onode &rhs) { auto &layout = rhs.get_layout(); return out << "Onode(" - << "size=" << static_cast(layout.size) - << ")"; + << "size=" << static_cast(layout.size) + << ")"; } } diff --git a/src/crimson/os/seastore/onode.h b/src/crimson/os/seastore/onode.h index e7d515c2d04..c556dcd36d7 100644 --- a/src/crimson/os/seastore/onode.h +++ b/src/crimson/os/seastore/onode.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- // vim: ts=8 sw=2 smarttab #pragma once diff --git a/src/crimson/os/seastore/onode_manager.h b/src/crimson/os/seastore/onode_manager.h index c08cd44cd06..8aecd730360 100644 --- a/src/crimson/os/seastore/onode_manager.h +++ b/src/crimson/os/seastore/onode_manager.h @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*- // vim: ts=8 sw=2 smarttab #pragma once diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc index ddc99d2cd17..8b2bb32b26b 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc @@ -18,12 +18,12 @@ FLTreeOnodeManager::get_onode_ret FLTreeOnodeManager::get_onode( return tree.find( trans, hoid ).safe_then([this, &hoid](auto cursor) - -> get_onode_ret { + -> get_onode_ret { if (cursor == tree.end()) { logger().debug( - "FLTreeOnodeManager::{}: no entry for {}", - __func__, - hoid); + "FLTreeOnodeManager::{}: no entry for {}", + __func__, + hoid); return crimson::ct_error::enoent::make(); } auto val = OnodeRef(new FLTreeOnode(cursor.value())); @@ -50,14 +50,14 @@ FLTreeOnodeManager::get_or_create_onode( trans, hoid, OnodeTree::tree_value_config_t{sizeof(onode_layout_t)} ).safe_then([&trans, &hoid](auto p) - -> get_or_create_onode_ret { + -> get_or_create_onode_ret { auto [cursor, created] = std::move(p); auto val = OnodeRef(new FLTreeOnode(cursor.value())); if (created) { logger().debug( - "FLTreeOnodeManager::{}: created onode for entry for {}", - __func__, - hoid); + "FLTreeOnodeManager::{}: created onode for entry for {}", + __func__, + hoid); val->get_mutable_layout(trans) = onode_layout_t{}; } return seastar::make_ready_future( @@ -80,15 +80,15 @@ FLTreeOnodeManager::get_or_create_onodes( [this, &hoids, &trans](auto &ret) { ret.reserve(hoids.size()); return crimson::do_for_each( - hoids, - [this, &trans, &ret](auto &hoid) { - return get_or_create_onode(trans, hoid - ).safe_then([&ret](auto &&onoderef) { - ret.push_back(std::move(onoderef)); - }); - }).safe_then([&ret] { - return std::move(ret); - }); + hoids, + [this, &trans, &ret](auto &hoid) { + return get_or_create_onode(trans, hoid + ).safe_then([&ret](auto &&onoderef) { + ret.push_back(std::move(onoderef)); + }); + }).safe_then([&ret] { + return std::move(ret); + }); }); } @@ -101,22 +101,22 @@ FLTreeOnodeManager::write_dirty_ret FLTreeOnodeManager::write_dirty( auto &flonode = static_cast(*onode); switch (flonode.status) { case FLTreeOnode::status_t::MUTATED: { - flonode.populate_recorder(trans); - return seastar::now(); + flonode.populate_recorder(trans); + return seastar::now(); } case FLTreeOnode::status_t::DELETED: { - return tree.erase(trans, flonode); + return tree.erase(trans, flonode); } case FLTreeOnode::status_t::STABLE: { - return seastar::now(); + return seastar::now(); } default: - __builtin_unreachable(); + __builtin_unreachable(); } }).handle_error( write_dirty_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error in FLTreeOnodeManager::write_dirty" + "Invalid error in FLTreeOnodeManager::write_dirty" } ); } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h index 5143f6a8472..b2af3c28dd5 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h @@ -88,14 +88,14 @@ class FLTreeOnodeManager : public crimson::os::seastore::OnodeManager { public: FLTreeOnodeManager(TransactionManager &tm) : tree(std::make_unique( - tm, laddr_t{})) {} + tm, laddr_t{})) {} mkfs_ret mkfs(Transaction &t) { return tree.mkfs(t ).handle_error( mkfs_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error in FLTreeOnodeManager::mkfs" + "Invalid error in FLTreeOnodeManager::mkfs" } ); } -- 2.39.5