import quincy beta 17.1.0

[ceph.git] / ceph / src / librbd / cache / pwl / DiscardRequest.cc

diff --git a/ceph/src/librbd/cache/pwl/DiscardRequest.cc b/ceph/src/librbd/cache/pwl/DiscardRequest.cc
index 9f66e077b1f14ed50d4768ca3251be0f5316e2b4..decefafb5277f9bbba4f8cad0ea9aaf7011cfea4 100644 (file)
--- a/ceph/src/librbd/cache/pwl/DiscardRequest.cc
+++ b/ceph/src/librbd/cache/pwl/DiscardRequest.cc
@@ -1,20 +1,14 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include <filesystem>
+
 #include "common/dout.h"
 #include "common/errno.h"
 #include "common/hostname.h"
 #include "librbd/asio/ContextWQ.h"
 #include "librbd/cache/pwl/DiscardRequest.h"
 
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
-
 #include "librbd/cache/pwl/ImageCacheState.h"
 
 #include "librbd/cache/Types.h"
@@ -28,6 +22,8 @@ namespace fs = std::experimental::filesystem;
 #define dout_prefix *_dout << "librbd::cache::pwl:DiscardRequest: " \
                            << this << " " << __func__ << ": "
 
+namespace fs = std::filesystem;
+
 namespace librbd {
 namespace cache {
 namespace pwl {