crimson/common: move write_file into crimson namespace

it simply does not belong to ceph::buffer

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/crimson/common/buffer_io.cc b/src/crimson/common/buffer_io.cc
index 7bdab058974335c27cd1e8423f71319dd950a1ba..68355684559e7cb41f55ed9de614e51e39df1182 100644 (file)
--- a/src/crimson/common/buffer_io.cc
+++ b/src/crimson/common/buffer_io.cc
@@ -9,7 +9,7 @@
 
 #include "include/buffer.h"
 
-namespace ceph::buffer {
+namespace crimson {
 
 seastar::future<> write_file(ceph::buffer::list&& bl,
                              seastar::sstring fn,

diff --git a/src/crimson/common/buffer_io.h b/src/crimson/common/buffer_io.h
index 5cc6a6e97b7bc93e4e26cece6f856f0812cbc400..0a98ec58fc207765389c7ea2dee21e027c76bfe0 100644 (file)
--- a/src/crimson/common/buffer_io.h
+++ b/src/crimson/common/buffer_io.h
@@ -8,7 +8,7 @@
 
 #include "include/buffer_fwd.h"
 
-namespace ceph::buffer {
+namespace crimson {
   seastar::future<> write_file(ceph::buffer::list&& bl,
                                seastar::sstring fn,
                                seastar::file_permissions= // 0644

diff --git a/src/crimson/os/cyanstore/cyan_store.cc b/src/crimson/os/cyanstore/cyan_store.cc
index 77c9799755dd22898bf34905c83606ec81f01630..4ba19f67effbad245c9b58f5d0a15963847a1146 100644 (file)
--- a/src/crimson/os/cyanstore/cyan_store.cc
+++ b/src/crimson/os/cyanstore/cyan_store.cc
@@ -71,12 +71,12 @@ seastar::future<> CyanStore::umount()
       ceph_assert(ch);
       ch->encode(bl);
       std::string fn = fmt::format("{}/{}", path, col);
-      return ceph::buffer::write_file(std::move(bl), fn);
+      return crimson::write_file(std::move(bl), fn);
     }).then([&collections, this] {
       ceph::bufferlist bl;
       ceph::encode(collections, bl);
       std::string fn = fmt::format("{}/collections", path);
-      return ceph::buffer::write_file(std::move(bl), fn);
+      return crimson::write_file(std::move(bl), fn);
     });
   });
 }
@@ -110,7 +110,7 @@ seastar::future<> CyanStore::mkfs(uuid_d new_osd_fsid)
     ceph::bufferlist bl;
     std::set<coll_t> collections;
     ceph::encode(collections, bl);
-    return ceph::buffer::write_file(std::move(bl), fn);
+    return crimson::write_file(std::move(bl), fn);
   }).then([this] {
     return write_meta("type", "memstore");
   });

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 743ff43071db5ec97cf8916db0c47a2737888df4..adce07981d39e490923a88aa042a1530005fafbb 100644 (file)
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -98,7 +98,7 @@ seastar::future<> make_keyring()
       keyring.encode_plaintext(bl);
       const auto permissions = (seastar::file_permissions::user_read |
                               seastar::file_permissions::user_write);
-      return ceph::buffer::write_file(std::move(bl), path, permissions);
+      return crimson::write_file(std::move(bl), path, permissions);
     }
   }).handle_exception_type([path](const fs::filesystem_error& e) {
     seastar::fprint(std::cerr, "FATAL: writing new keyring to %s: %s\n", path, e.what());