From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 7 Jul 2020 13:09:22 +0000 (+0200)
Subject: crimson/osd: use std::filesystem without S*'s compatibility layer.
X-Git-Tag: v16.1.0~1424^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7acef5765b3433f6e6553b902136bef01724256e;p=ceph.git

crimson/osd: use std::filesystem without S*'s compatibility layer.

This is needed as newer versions of the framework have
the `seastar::compat` compatibility layer stripped.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 9c31b9942e19..9d14689e7935 100644
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -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;
   });