From b0cac5e9363f97ac8be74f8d9775d5ebc88d61e0 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Tue, 10 Dec 2019 15:12:02 -0500
Subject: [PATCH] ceph 14.2.5 GA

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 0001-s390x-A-compile-hack.patch | 64 ---------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 0001-s390x-A-compile-hack.patch

diff --git a/0001-s390x-A-compile-hack.patch b/0001-s390x-A-compile-hack.patch
deleted file mode 100644
index 951a487..0000000
--- a/0001-s390x-A-compile-hack.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 94db732128bdeec330f7353f2514940bc1abd97b Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Thu, 28 Feb 2019 00:58:12 +0100
-Subject: [PATCH] s390x: A compile hack
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- src/rgw/rgw_dmclock_async_scheduler.cc     | 2 ++
- src/test/rgw/test_rgw_dmclock_scheduler.cc | 7 ++++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc b/src/rgw/rgw_dmclock_async_scheduler.cc
-index 18ba5a5e32..08657cf2b5 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.cc
-+++ b/src/rgw/rgw_dmclock_async_scheduler.cc
-@@ -41,6 +41,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
-                                           const Time& time, const Cost& cost,
-                                           optional_yield yield_ctx)
- {
-+#ifdef HAVE_BOOST_CONTEXT
-     ceph_assert(yield_ctx);
- 
-     auto &yield = yield_ctx.get_yield_context();
-@@ -53,6 +54,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
-       else
-         return -ec.value();
-     }
-+#endif
- 
-     return 0;
- }
-diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc
-index 7d2ef9b328..e09f727972 100644
---- a/src/test/rgw/test_rgw_dmclock_scheduler.cc
-+++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc
-@@ -14,6 +14,8 @@
- 
- //#define BOOST_ASIO_ENABLE_HANDLER_TRACKING
- 
-+#ifdef HAVE_BOOST_CONTEXT
-+
- #include "rgw/rgw_dmclock_sync_scheduler.h"
- #include "rgw/rgw_dmclock_async_scheduler.h"
- 
-@@ -76,7 +78,6 @@ TEST(Queue, SyncRequest)
-   EXPECT_EQ(0u, counters(client_id::auth)->get(queue_counters::l_cancel));
- }
- 
--#ifdef HAVE_BOOST_CONTEXT
- TEST(Queue, RateLimit)
- {
-   boost::asio::io_context context;
-@@ -426,6 +427,6 @@ TEST(Queue, SpawnAsyncRequest)
-   EXPECT_TRUE(context.stopped());
- }
- 
--#endif
--
- } // namespace rgw::dmclock
-+
-+#endif
--- 
-2.20.1
-