]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: use std::filesystem without S*'s compatibility layer.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 7 Jul 2020 13:09:22 +0000 (15:09 +0200)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 6 Aug 2020 21:59:05 +0000 (17:59 -0400)
This is needed as newer versions of the framework have
the `seastar::compat` compatibility layer stripped.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/osd/main.cc

index 9c31b9942e195dc1ef3677b1a00ec420e095a09e..9d14689e79354cf3f82fdfdc8c5063fd27e4a379 100644 (file)
@@ -22,7 +22,6 @@
 #include "osd.h"
 
 using config_t = crimson::common::ConfigProxy;
-namespace fs = seastar::compat::filesystem;
 
 void usage(const char* prog) {
   std::cout << "usage: " << prog << " -i <ID>\n"
@@ -100,7 +99,7 @@ seastar::future<> make_keyring()
                               seastar::file_permissions::user_write);
       return crimson::write_file(std::move(bl), path, permissions);
     }
-  }).handle_exception_type([path](const fs::filesystem_error& e) {
+  }).handle_exception_type([path](const std::filesystem::filesystem_error& e) {
     seastar::fprint(std::cerr, "FATAL: writing new keyring to %s: %s\n", path, e.what());
     throw e;
   });