gentoo resync : 08.08.2018

14 files changed, 0 insertions, 713 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 091380ad9c9e..a8e23a987020 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -9,19 +9,10 @@ AUX ceph-10.2.5-Make-RBD-Python-bindings-compatible-with-Python-3.patch 2155 BLA
 AUX ceph-10.2.7-fix-compilation-with-zstd.patch 1782 BLAKE2B 35c63ded6f1a4740befe952e3685743f0f4cb2500f6451406133d3074179cba0703389c07a9936ecee7d2afc83db24aa212aaea3a856f240230bb6ea76fcb975 SHA512 5929217f64deb45fd803e33cd277443cbb5f5f956fc4be05490a07dae0b02467317426993c7fc44173a18955261e3a73e603775db12e788a93c851f992539ad6
 AUX ceph-10.2.9-cflags.patch 449 BLAKE2B a1fc3d1a1e5bb891932d0697631b9a604a47e4c564dc99ef1247cb9e5c26ba7bb5e421b4ca624e78b31d279c93db2965eab31d38f1d3b8fd93d247789ae9408c SHA512 17a165710b0effacc34257daf077f70f55e27f0bddd4dd58bbc8638653ebd13eeabffbb4ead40ddc3a69586c65e01f911ee5f8e1bde94576d66928f0928fa510
 AUX ceph-10.2.9-dont-run-lsb_release.patch 2862 BLAKE2B 94e31ddba114ff798f3334c71df551fd267ca716a4aa4aa8e8ebf534a5e38d1b55d7a102306b60cb7dc7337ba009898c02f953a74b34580a85369788a7169018 SHA512 e97a0c2a40c886029bbff12f8591147b88d5eae86dc79a63b267f10745a465da62786cf41c9fd0f01f51805907633c1fe954ebe09b0730660cf690f2c53a8252
-AUX ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch 2970 BLAKE2B 24bcf9d00532b0712d5de34ca1422c2f8774571c4b15fb0a3345f5e161a5d6c33b88b33ac96c81afa0517e8619dcd1dd0fb982c56e1967e705fa081ffff62776 SHA512 e0adf5b7c299a69393dcf0ff31def1ad7f39eb242f8d9e170c84ee5c1ea92442287575af1f64fd630ac6877500b9e2ccb34dee1286cf91b1d52094042dfdb0d8
-AUX ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch 1412 BLAKE2B b1768b95c109bb281a4963e9fcc4d471eb6a0b19484273965a3cf1dfc6ba4ef239b14c67b0e98118356840ef709544813bb3a1defb97e2ab1d8aadce42e9461b SHA512 23dd7651edb176419d62648e9d29957b9819129f1f50ac97608c16d658d21787ded5f162b6f4c3e6b404f2d5aee47514a84278692684f0d6f7506c84cc71f37a
-AUX ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch 1017 BLAKE2B a76eaa64db3e19848fc9b1ae964b355783b30f24e998f16e121f29227ff4de4cb3b7e1552e437f1681c7826ed77b4a11a3b7bf489b8159c91c718cd834b949a2 SHA512 76a051a0fb2cf2f2b38655f7cc1866c745b6e59d999bc49666efc0e29d5e72aa26259241b9a9f4cc20a1863c3636a42a4d49d6d942d2d7456ce122b346a0f378
-AUX ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch 1422 BLAKE2B 4413687757d944c43d216a46db731d5dc3594f795e836d95c9367a5d66b8a828b614ad1079fef2459ccc7ff5ae1fdd448244aa9d2f18f78d1fe0e6c221cd1aa2 SHA512 62351c1ac682938e138cb1b6f668f9d9b841d3d57b84fbe6402ae9f7d7e2379c538c5d83335535d842da2870c3449bfcd39f66118f89422e7eb6fe8f04b0a52b
-AUX ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch 1358 BLAKE2B 433acfc3a777fdce8b636d73848d06c6de03f68a53480d1523c5518f9350072fbbe1562ae0723c32f4f048019b7221ef9278a6b2c95f70d3d3a4dfa9da46590e SHA512 0c07702ca78195575a66efecb8e75393da8dc5706e08ffc1e598daab288f6678f6333085d929d69dc5828494c360a83bae3df2b96efb7ddaf782d43691eedba9
-AUX ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch 1111 BLAKE2B fc109bb20f3f6259f5ca78b2ac076dac0077e2f8466c76d9db1fcff2b59ab28991b69484e73b6cbe9618b74e1d3141079950ff183382c72f03a92f922b92089d SHA512 cf475d9de2ae0c4c41389458f9f256da0f584650ce8204779e7a537cf62195cb5017233b3dcdbe0a5aeed8d7512e4db964a43ac4856e779b6ebcb7a6f676e7bc
-AUX ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch 1353 BLAKE2B 9bc3a246093f851c51ec3b094f22b90727eda6ac88ab1eef671184370cd3c70de613b97bf96ad9fd01cdf4dd9cc6a44f17b4aa6918f86c1eb4c281b30677e483 SHA512 050d4439fb66b8dcb3ec3fe010bc6193e287dae2a7d25e7a58c4ce733e32a596271f6a69667039abe3e21b66918396a65d579b5da5665fb6e1e292be4b78ffa1
 AUX ceph-12.2.0-cflags.patch 536 BLAKE2B 9eb8dc48db09d35f86de280a36763b7a56d980adbaa2d68045e6378cb68904e939d8e7f7325fc5102151ea4e1f5133751b620885d1d0b3d6fe565291272b4b2a SHA512 9864da1a83c1145d143eedd73fd3ff142b354fd0bffa73a25f30eabd68d7eddee82208be7b7da74536ba4c996808aa77fc55bcf562a409240d69cbd249ef1d75
 AUX ceph-12.2.0-use-provided-cpu-flag-values.patch 1590 BLAKE2B 684dfd301a144e2958497bf588515b0319d4e2c5cc5a6c5949d4c2c6f0d41f94aca2c43c020285f4b467f42f9f9a3944ce3a5600dc95e3b8443c8420cfb76128 SHA512 ecf4067776a146cf2aaf0b83298e508a6073147e555f4f9ba73cf2d9e0fe26d9ea72fff8af1c67eaa436e30d32ed260f75683c7d77b27a88fbb098b561d13f0d
 AUX ceph-12.2.1-systemd-unitdir.patch 345 BLAKE2B b97856edd071beb28e46301e97f996176dd62b6824ccc2154b7640ce629b1c0698c2d79e074a2df3af91ab34d6f7e84b2a5a04d41d8fa3b64b571a016ab14f19 SHA512 a29373704f645f5b52597f5482fb4538f3d335bb1020c206a089ba58707f988cf42d335f17a36911f373936f8e769613c3d3fa98f55c1fd91d433d036b769bcc
-AUX ceph-12.2.2-build-without-radosgw.patch 999 BLAKE2B 2e4d995f82c43ca3d96c3e5f9acd8bf827b85055f4d558688de899b52573d7445ed72979bec5cd074b6ed3a7139227605571f79a5fbc5b2f0a2ce942d11d2296 SHA512 8ff2efef0bcf0fcf339cefeee6a54384ea6a2c219bc8b171e2306ca9043ffd9d95468c567966fabb5c1373adb00b4fe036daddb7715c232c029cda1e3d21bb83
 AUX ceph-12.2.4-boost-build-none-options.patch 932 BLAKE2B 7925da8f8f18e26af24a00a4fe595f900d9f676769614576c059513299c05cae1c982db8bdd3a571c04ace1ff1ea6171631c1373c408f465261b73e05f66580e SHA512 6ff46a90d76f667fa23be0f9eb1ed2fb7e30af9a2621aec19944d0a22a431a0f5721603c588286e483ff55c14aac920adfccb039c9678a87cc59640dd70367ae
-AUX ceph-12.2.4-boost-sonames.patch 5145 BLAKE2B 70609fbcf98c556bc681a27da37abaf0178f0d60850f3d5dd7806f71dcc21affd103bbc4ffcd21be7ebe6a82a04eab5a46548aeb1d18ad398860e14f50b86ec6 SHA512 d8a69c34c02848ba918bf65f318bb02f27cbbbd618a337cc21153cad4ab33a07dfef27d8cfb1d2839b145a245483c57dfdbddb87061a5f9ce215fb6df94ef591
 AUX ceph-12.2.4-cflags.patch 1473 BLAKE2B 971ae7673ed21485248eb582762529c20991b487fae16221a7b6b6d30e29795e26ef83b5af3f7003f58a86784e9c846d2512cee76a440bf5f12b2b5b64968ec6 SHA512 402a5948e90f7daeb29c84a6204d88f6198fab17ac78ef69b5e7d8f54f9f61ed4995c4da2b37bed4448049077bd6167f69ad1c7c62105e924d5d8f8313f68f4e
 AUX ceph-12.2.4-rocksdb-cflags.patch 601 BLAKE2B e434a0e05148e4df0848d9d0d36c7894ecadef0f1c9254dcc1eda782002f473471803372130e12a6b070f857b5f0279e8a7ee2dcf3623b8ca8e02234d4b9d6c1 SHA512 324acb8b94a050bee19e149d6a48a73f596fdf921c5f06d75475069bafcf2a230e0c12f3bb25ec6cd78f1f12334702691b73c2e2643dac63ba4bc71ac9ad0a48
 AUX ceph-12.2.5-boost-sonames.patch 5546 BLAKE2B 8062f550dd36371b1f89981ed2c63e5d8ff4273a6843f8cb8227c38fcfe29c1ce42c07578c3491a9b04e548d0c76a27481a7cb9ae2afad2870191090697c6f4b SHA512 0f48e5107be166306c832bc998c4375759e783ce0159250b3440f22ed7ef3b16fefc9e2258b53829145361d2e2e6bae97e09dde6ed81149a137f3ce84fe4ee47
@@ -35,13 +26,9 @@ AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
 AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02942590f90e41d646205c44c9d4c7778c844fcc268d69410a6e76ca825882a5e1d4b1e86b0123905b1d6c081de SHA512 8f169a73f21968f550c6fb21ca7b1efde522b7cccaae0e0c4e22c67ee9c7ccfec7845de3cf84af1075ac9f8840b044dc9440e7936fb9079899df06df350ff9f2
 AUX ceph.confd-r1 69 BLAKE2B 2e75612a1c36057ab41939b4022c8211e32082a812e9636862fd97b4250594fbf3fbd6739e4faf84c056a8b5402a9089250ea84ce504f2bf2453c09f34dc2fee SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa
-AUX ceph.confd-r2 171 BLAKE2B 1d36905fdf12edd863679ddaede09b479091a972eba05fab9a6db402e49907e270ecc395524326d6d7fb37901224e4ba45a3eaa23adb2227e2d1b78d9661fd0a SHA512 f7170644341e6c8dcb71ca3a4325c8da3325ebe83898cbf11b47b41ea4f899781b9bc87fd21e006292de78fe9e905ac4703d10afcf91a4687002663469201ba9
 AUX ceph.confd-r3 1315 BLAKE2B bf5c573be6bcfd2c7f077087c36f8e918f027ad81b18ec496348ed155c97332ad6d1567a9c69a3c887fa0bdd184b98cbe7b73198db32aae248e31c7599857a96 SHA512 1d192cc8eec9b294440ee6c43966ccc36669b94007dd6b990c5ee8d18ee1b36730a9a0082ef7170846dcc64adcc61481808e854b6c9bdb2eb1db1c71435d3f05
 AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c856efab51e64f36ae5435bec761bd85f7b42bfe78ebc28c267ba80ee0b4123b960ffaf35b749ff25 SHA512 ea3e7b668f6fcdf7f1884968a33d06c86448426a83cb132f927c32d83e28adaf8789489e7e817d4349479e3647577ef40190fc75fa88553aac1c7b4f515184c9
 AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038e650439ff3420a41d2a43ac527fadf700919ba9944b6da551b2fc5a665f915104717ef45474421 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0
-AUX ceph.initd-r4 1189 BLAKE2B 065554902fdd5c44fff69868e72817ee24916c6f93a3e332b7a673414dc27f80dc73f9f4266fb3c367ccdce036bb90a03b09cdd152f64567d1ba250d711ba0d0 SHA512 dbb69228ee566490bec93823040885e419bfbd7dc076c802cc97b47dde9fbb06a99f61498cc438c90fd0474b2ad7247d756b977fb415b0f1168442036a48bd97
-AUX ceph.initd-r5 2178 BLAKE2B d943da59449e796a9c592e173654275b40ba3701fd6c694521a1975e3070ee465b9dbc2ba748cbd99d94e00a82d792ca88f6b4c1cd299572bdd3d8829adcedbe SHA512 4037639b6de65e0966f1aa850778b87f4f8f926af621f68155e98f103e233b7ebb2fba18a65ca150b16767bb80581259f4720c925ed00777d640f19471147c90
-AUX ceph.initd-r6 2180 BLAKE2B c262225412e6e5bf61d315f661721c27f97726dd5eb4cb8696845c29ab95d2ad29b011db6e8d488ce58d71ac875008588737a453de8472ef7f6bb9309fd4f100 SHA512 9f19186da7a6150b4d371fdd5523a07979ef9c318242422f04ed0178b33e6886ac1333cad8a41aa0d75af2aa08d7ee8ec9075d980d32fcddc8558d143a425a01
 AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c
 AUX ceph.initd-r8 2363 BLAKE2B 43dd8f5eb9516b76609a91b1884cbe81d3afbd7634bc39987ecceab612a431e6b967d07c9b7d4a02352fe6545d999eaf1a137bb8d49865830a865ff2ed979186 SHA512 9061c97848e1826ae731202c763d8464f09dff013ae5855ce698d839f99d5184a533c3a81bba223d8f50051573e1fec92e915db32b26ac278b01bf17406cbba8
 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch b/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch
deleted file mode 100644
index e67113e51cc8..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-filestore_fix_infinit_loops_in_fiemap.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b52bfe6b443f0ff88c8614441752102058063699 Mon Sep 17 00:00:00 2001
-From: Ning Yao <yaoning@unitedstack.com>
-Date: Thu, 6 Apr 2017 11:12:04 +0000
-Subject: [PATCH] os/filestore: fix infinit loops in fiemap()
-
-since fiemap can get extents based on offset --> len
-but we should consider last extents is retrieved when len == 0
-even though it is not last fiemap extents
-
-Signed-off-by: Ning Yao <yaoning@unitedstack.com>
-(cherry picked from commit 36f6b668a8910d76847674086cbc86910c78faee)
----
- src/os/filestore/FileStore.cc      | 13 +++++--------
- src/test/objectstore/store_test.cc | 21 +++++++++++++++++++++
- 2 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
-index c47b0d0d2eae..95f48cdf4960 100644
---- a/src/os/filestore/FileStore.cc
-+++ b/src/os/filestore/FileStore.cc
-@@ -3102,17 +3102,14 @@ int FileStore::_do_fiemap(int fd, uint64_t offset, size_t len,
-     i++;
-     last = extent++;
-   }
--  const bool is_last = last->fe_flags & FIEMAP_EXTENT_LAST;
-+  uint64_t xoffset = last->fe_logical + last->fe_length - offset;
-+  offset = last->fe_logical + last->fe_length;
-+  len -= xoffset;
-+  const bool is_last = (last->fe_flags & FIEMAP_EXTENT_LAST) || (len == 0);
-+  free(fiemap);
-   if (!is_last) {
--    uint64_t xoffset = last->fe_logical + last->fe_length - offset;
--    offset = last->fe_logical + last->fe_length;
--    len -= xoffset;
--    free(fiemap); /* fix clang warn: use-after-free */
-     goto more;
-   }
--  else {
--    free(fiemap);
--  }
- 
-   return r;
- }
-diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
-index 5ab011ad17d8..4cada7e2e435 100644
---- a/src/test/objectstore/store_test.cc
-+++ b/src/test/objectstore/store_test.cc
-@@ -279,6 +279,7 @@ TEST_P(StoreTest, FiemapHoles) {
-     ASSERT_EQ(r, 0);
-   }
-   {
-+    //fiemap test from 0 to SKIP_STEP * (MAX_EXTENTS - 1) + 3
-     bufferlist bl;
-     store->fiemap(cid, oid, 0, SKIP_STEP * (MAX_EXTENTS - 1) + 3, bl);
-     map<uint64_t,uint64_t> m, e;
-@@ -295,6 +296,26 @@ TEST_P(StoreTest, FiemapHoles) {
-     ASSERT_TRUE((m.size() == 1 &&
- 		 m[0] > SKIP_STEP * (MAX_EXTENTS - 1)) ||
- 		 (m.size() == MAX_EXTENTS && extents_exist));
-+
-+    // fiemap test from SKIP_STEP to SKIP_STEP * (MAX_EXTENTS - 2) + 3
-+    // reset bufferlist and map
-+    bl.clear();
-+    m.clear();
-+    e.clear();
-+    store->fiemap(cid, oid, SKIP_STEP, SKIP_STEP * (MAX_EXTENTS - 2) + 3, bl);
-+    p = bl.begin();
-+    ::decode(m, p);
-+    cout << " got " << m << std::endl;
-+    ASSERT_TRUE(!m.empty());
-+    ASSERT_GE(m[SKIP_STEP], 3u);
-+    extents_exist = true;
-+    if (m.size() == (MAX_EXTENTS - 2)) {
-+      for (uint64_t i = 1; i < MAX_EXTENTS - 1; i++)
-+	extents_exist = extents_exist && m.count(SKIP_STEP*i);
-+    }
-+    ASSERT_TRUE((m.size() == 1 &&
-+		 m[SKIP_STEP] > SKIP_STEP * (MAX_EXTENTS - 2)) ||
-+		 (m.size() == (MAX_EXTENTS - 1) && extents_exist));
-   }
-   {
-     ObjectStore::Transaction t;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch b/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch
deleted file mode 100644
index eaf18c35783d..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-libradosstriper_fix_format_injection_vulnerability.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/libradosstriper/RadosStriperImpl.cc b/src/libradosstriper/RadosStriperImpl.cc
-index 22352d9125..70dcb7569f 100644
---- a/src/libradosstriper/RadosStriperImpl.cc
-+++ b/src/libradosstriper/RadosStriperImpl.cc
-@@ -12,6 +12,8 @@
-  *
-  */
- 
-+#include <boost/algorithm/string/replace.hpp>
-+
- #include "libradosstriper/RadosStriperImpl.h"
- 
- #include <errno.h>
-@@ -466,7 +468,9 @@ int libradosstriper::RadosStriperImpl::aio_read(const std::string& soid,
-   // get list of extents to be read from
-   vector<ObjectExtent> *extents = new vector<ObjectExtent>();
-   if (read_len > 0) {
--    std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
-+    std::string format = soid;
-+    boost::replace_all(format, "%", "%%");
-+    format += RADOS_OBJECT_EXTENSION_FORMAT;
-     file_layout_t l;
-     l.from_legacy(layout);
-     Striper::file_to_extents(cct(), format.c_str(), &l, off, read_len,
-@@ -776,7 +780,9 @@ libradosstriper::RadosStriperImpl::internal_aio_write(const std::string& soid,
-   if (len > 0) {
-     // get list of extents to be written to
-     vector<ObjectExtent> extents;
--    std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
-+    std::string format = soid;
-+    boost::replace_all(format, "%", "%%");
-+    format += RADOS_OBJECT_EXTENSION_FORMAT;
-     file_layout_t l;
-     l.from_legacy(layout);
-     Striper::file_to_extents(cct(), format.c_str(), &l, off, len, 0, extents);
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch b/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch
deleted file mode 100644
index 6800285318f0..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-librbd_filter_expected_error_codes_from_is_exclusive_lock_owner.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 787ba33e5dba285dff874955a8f0d7aabd3f87fe Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Mon, 5 Jun 2017 08:17:05 -0400
-Subject: [PATCH] librbd: filter expected error codes from
- is_exclusive_lock_owner
-
-Fixes: http://tracker.ceph.com/issues/20182
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
-(cherry picked from commit d4daaf54e6bc42cd4fb2111ea20b2042941b0c31)
----
- src/librbd/internal.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
-index 9fecb1e1688f..6021be078090 100644
---- a/src/librbd/internal.cc
-+++ b/src/librbd/internal.cc
-@@ -2110,7 +2110,9 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
-     // might have been blacklisted by peer -- ensure we still own
-     // the lock by pinging the OSD
-     int r = ictx->exclusive_lock->assert_header_locked();
--    if (r < 0) {
-+    if (r == -EBUSY || r == -ENOENT) {
-+      return 0;
-+    } else if (r < 0) {
-       return r;
-     }
- 
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch b/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch
deleted file mode 100644
index 8bf14c2944ba..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-osd-scrub_to_specifies_clone_ver_but_transaction_include.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 153f77544118613e19d5e88c030c3901234cf950 Mon Sep 17 00:00:00 2001
-From: David Zafman <dzafman@redhat.com>
-Date: Tue, 18 Jul 2017 15:08:14 -0700
-Subject: [PATCH] osd: scrub_to specifies clone ver, but transaction include
- head write ver
-
-Fixes: http://tracker.ceph.com/issues/20041
-
-Signed-off-by: David Zafman <dzafman@redhat.com>
-(cherry picked from commit fd598a0d23d61c645633ae774c3404a43d035e3c)
-
-Conflicts:
-	src/osd/ReplicatedPG.cc (trivial)
----
- src/osd/ReplicatedPG.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
-index 4b4dc34c602a..4d80ad1770e1 100644
---- a/src/osd/ReplicatedPG.cc
-+++ b/src/osd/ReplicatedPG.cc
-@@ -8318,7 +8318,7 @@ void ReplicatedPG::op_applied(const eversion_t &applied_version)
-   last_update_applied = applied_version;
-   if (is_primary()) {
-     if (scrubber.active) {
--      if (last_update_applied == scrubber.subset_last_update) {
-+      if (last_update_applied >= scrubber.subset_last_update) {
-         requeue_scrub();
-       }
-     } else {
-@@ -8326,7 +8326,7 @@ void ReplicatedPG::op_applied(const eversion_t &applied_version)
-     }
-   } else {
-     if (scrubber.active_rep_scrub) {
--      if (last_update_applied == static_cast<MOSDRepScrub*>(
-+      if (last_update_applied >= static_cast<MOSDRepScrub*>(
- 	    scrubber.active_rep_scrub->get_req())->scrub_to) {
- 	osd->op_wq.queue(
- 	  make_pair(
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch b/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch
deleted file mode 100644
index 4b03e335bc58..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-rbd-do_not_attempt_to_load_key_if_auth_is_disabled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0cd7df3649d7486d444a61cab89c48a89ddd3e8d Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Thu, 29 Jun 2017 14:54:40 -0400
-Subject: [PATCH] rbd: do not attempt to load key if auth is disabled
-
-Fixes: http://tracker.ceph.com/issues/19035
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
-(cherry picked from commit 8b9c8df6d7f0b75c5451953bb322bc1f9afb6299)
----
- src/krbd.cc | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/krbd.cc b/src/krbd.cc
-index a0e546fa7f6f..2bb6b4270abd 100644
---- a/src/krbd.cc
-+++ b/src/krbd.cc
-@@ -129,13 +129,15 @@ static int build_map_buf(CephContext *cct, const char *pool, const char *image,
-   oss << " name=" << cct->_conf->name.get_id();
- 
-   KeyRing keyring;
--  r = keyring.from_ceph_context(cct);
--  if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
--                        cct->_conf->key.length()))
--    r = 0;
--  if (r < 0) {
--    cerr << "rbd: failed to get secret" << std::endl;
--    return r;
-+  if (cct->_conf->auth_client_required != "none") {
-+    r = keyring.from_ceph_context(cct);
-+    if (r == -ENOENT && !(cct->_conf->keyfile.length() ||
-+                          cct->_conf->key.length()))
-+      r = 0;
-+    if (r < 0) {
-+      cerr << "rbd: failed to get secret" << std::endl;
-+      return r;
-+    }
-   }
- 
-   CryptoKey secret;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch b/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch
deleted file mode 100644
index 5cb89be0edf1..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-rbd-nbd_relax_size_check_for_newer_kernel_versions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
-index 2e399ab832..88e1e0ff65 100644
---- a/src/tools/rbd_nbd/rbd-nbd.cc
-+++ b/src/tools/rbd_nbd/rbd-nbd.cc
-@@ -469,6 +469,10 @@ static int open_device(const char* path, bool try_load_moudle = false)
- 
- static int check_device_size(int nbd_index, unsigned long expected_size)
- {
-+  // There are bugs with some older kernel versions that result in an
-+  // overflow for large image sizes. This check is to ensure we are
-+  // not affected.
-+
-   unsigned long size = 0;
-   std::string path = "/sys/block/nbd" + stringify(nbd_index) + "/size";
-   std::ifstream ifs;
-@@ -480,6 +484,12 @@ static int check_device_size(int nbd_index, unsigned long expected_size)
-   ifs >> size;
-   size *= RBD_NBD_BLKSIZE;
- 
-+  if (size == 0) {
-+    // Newer kernel versions will report real size only after nbd
-+    // connect. Assume this is the case and return success.
-+    return 0;
-+  }
-+
-   if (size != expected_size) {
-     cerr << "rbd-nbd: kernel reported invalid device size (" << size
-          << ", expected " << expected_size << ")" << std::endl;
diff --git a/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch b/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch
deleted file mode 100644
index 60f46ab36a40..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.9-unlock_sdata_op_ordering_lock_with_sdata_lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3fa277b479d69699bf5a6875cd4a5efcf9ae0788 Mon Sep 17 00:00:00 2001
-From: Alexey Sheplyakov <asheplyakov@mirantis.com>
-Date: Tue, 27 Jun 2017 16:07:01 +0400
-Subject: [PATCH] jewel: osd: unlock sdata_op_ordering_lock with sdata_lock
- hold to avoid missing wakeup signal
-
-Based on commit bc683385819146f3f6f096ceec97e1226a3cd237. The OSD code has
-been refactored a lot since Jewel, hence cherry-picking that patch introduces
-a lot of unrelated changes, and is much more difficult than reusing the idea.
-
-Fixes: http://tracker.ceph.com/issues/20428
-
-Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
----
- src/osd/OSD.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
-index f5cfda3b686a..38a2711f6f92 100644
---- a/src/osd/OSD.cc
-+++ b/src/osd/OSD.cc
-@@ -8727,9 +8727,9 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb )
-   assert(NULL != sdata);
-   sdata->sdata_op_ordering_lock.Lock();
-   if (sdata->pqueue->empty()) {
--    sdata->sdata_op_ordering_lock.Unlock();
-     osd->cct->get_heartbeat_map()->reset_timeout(hb, 4, 0);
-     sdata->sdata_lock.Lock();
-+    sdata->sdata_op_ordering_lock.Unlock();
-     sdata->sdata_cond.WaitInterval(osd->cct, sdata->sdata_lock, utime_t(2, 0));
-     sdata->sdata_lock.Unlock();
-     sdata->sdata_op_ordering_lock.Lock();
diff --git a/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch b/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch
deleted file mode 100644
index 29257c4747d6..000000000000
--- a/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b00ac12f4045cd39ac9a436cf32d233d16bc3485 Mon Sep 17 00:00:00 2001
-From: Jason Dillaman <dillaman@redhat.com>
-Date: Tue, 5 Dec 2017 09:58:04 -0500
-Subject: [PATCH] ceph-dencoder: moved RBD types outside of RGW preprocessor
- guard
-
-Fixes: http://tracker.ceph.com/issues/22321
-Signed-off-by: Jason Dillaman <dillaman@redhat.com>
----
- src/test/encoding/types.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
-index c061e93bd58c..4cfcb15edff1 100644
---- a/src/test/encoding/types.h
-+++ b/src/test/encoding/types.h
-@@ -405,6 +405,8 @@ TYPE(rgw_data_sync_info)
- TYPE(rgw_data_sync_marker)
- TYPE(rgw_data_sync_status)
- 
-+#endif
-+
- #ifdef WITH_RBD
- #include "cls/rbd/cls_rbd.h"
- TYPE(cls_rbd_parent)
-@@ -416,8 +418,6 @@ TYPE(cls::rbd::MirrorImage)
- TYPE(cls::rbd::MirrorImageMap)
- #endif
- 
--#endif
--
- #include "cls/lock/cls_lock_types.h"
- TYPE(rados::cls::lock::locker_id_t)
- TYPE_FEATUREFUL(rados::cls::lock::locker_info_t)
diff --git a/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch
deleted file mode 100644
index 59c645dea95c..000000000000
--- a/sys-cluster/ceph/files/ceph-12.2.4-boost-sonames.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7aa8a4392e..111f669f2e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -622,13 +622,13 @@ set(ceph_common_objs
-   $<TARGET_OBJECTS:crush_objs>)
- set(ceph_common_deps
-   json_spirit erasure_code rt ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::regex
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_regex
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -712,7 +712,7 @@ if (WITH_MGR)
-                  $<TARGET_OBJECTS:heap_profiler_objs>)
-   target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
-   target_link_libraries(ceph-mgr osdc client global-static common
--      Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-+	  boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
-   install(TARGETS ceph-mgr DESTINATION bin)
- endif (WITH_MGR)
- 
-@@ -885,7 +885,7 @@ set(ceph_mds_srcs
-   ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common
--  Boost::thread)
-+  boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
- 
- add_subdirectory(erasure-code)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index f3999e3b01..0ce7fca1ba 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -148,7 +148,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-@@ -202,7 +202,7 @@ if(${WITH_RADOSGW})
-     cls_rgw_client
-     cls_user_client
-     cls_lock_client
--    Boost::regex
-+    boost_regex
-     ${BLKID_LIBRARIES}
-     ${CURL_LIBRARIES}
-     ${EXPAT_LIBRARIES}
-@@ -232,7 +232,7 @@ if(${WITH_RADOSGW})
-     cls_rgw_client
-     cls_user_client
-     cls_lock_client
--    Boost::regex
-+    boost_regex
-     ${BLKID_LIBRARIES}
-     ${CURL_LIBRARIES}
-     ${EXPAT_LIBRARIES}
-diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
-index 9fba701e05..da3cbcfe96 100644
---- a/src/test/bench/CMakeLists.txt
-+++ b/src/test/bench/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(smalliobench_srcs
- add_executable(ceph_smalliobench
-   ${smalliobench_srcs}
-   )
--target_link_libraries(ceph_smalliobench librados Boost::program_options global
-+target_link_libraries(ceph_smalliobench librados boost_program_options global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_smalliobenchrbd
-@@ -27,7 +27,7 @@ if(WITH_RBD)
-     librados
-     os
-     global
--    Boost::program_options
-+    boost_program_options
-     ${BLKID_LIBRARIES}
-     ${CMAKE_DL_LIBS}
-     )
-@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs
- add_executable(ceph_smalliobenchfs
-   ${ceph_smalliobenchfs_srcs}
-   )
--target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_smalliobenchdumb
-@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs
- add_executable(ceph_smalliobenchdumb
-   ${smalliobenchdumb_srcs}
-   )
--target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global
-+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) 
- 
- # ceph_tpbench
-@@ -73,7 +73,7 @@ set(tpbench_srcs
- add_executable(ceph_tpbench
-   ${tpbench_srcs}
-   )
--target_link_libraries(ceph_tpbench librados Boost::program_options global
-+target_link_libraries(ceph_tpbench librados boost_program_options global
-   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
- 
- install(TARGETS
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index 7502085895..1a430c201a 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -23,13 +23,13 @@ target_link_libraries(ceph_radosacl librados global)
- install(TARGETS ceph_radosacl DESTINATION bin)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- install(PROGRAMS
-   ceph-monstore-update-crush.sh
-@@ -40,7 +40,7 @@ add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool fuse)
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph.confd-r2 b/sys-cluster/ceph/files/ceph.confd-r2
deleted file mode 100644
index 13b1cfad4588..000000000000
--- a/sys-cluster/ceph/files/ceph.confd-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-# default ceph conf file
-#ceph_conf="/etc/ceph/ceph.conf"
-
-# Set ulimits for Ceph services.
-rc_ulimit="-n 32768"
-
-# initd stop timeout.
-#CEPH_TERMTIMEOUT="TERM/60/KILL/5"
diff --git a/sys-cluster/ceph/files/ceph.initd-r4 b/sys-cluster/ceph/files/ceph.initd-r4
deleted file mode 100644
index 33e1a3002ac9..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r4
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-start_stop_daemon_args="--user ceph --group ceph"
-retry="${CEPH_TERMTIMEOUT:-TERM/60/KILL/5}"
-
-depend() {
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o ceph "$(dirname "${pidfile}")"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-	fi
-
-	if pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
-	eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r5 b/sys-cluster/ceph/files/ceph.initd-r5
deleted file mode 100644
index 18f539a57a8f..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r5
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 131072 -u 257256}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/dev/null}
-: ${stderr:=/dev/null}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-	
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.initd-r6 b/sys-cluster/ceph/files/ceph.initd-r6
deleted file mode 100644
index fd31b17eb5e3..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r6
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-: ${rundir:=/run/ceph}
-: ${user:=ceph}
-: ${group:=ceph}
-: ${rc_ulimit:=-n 1048576 -u 1048576}
-
-pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
-daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
-
-command="/usr/bin/${RC_SVCNAME%%.*}"
-command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
-command_args_foreground="--foreground"
-
-retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
-start_stop_daemon_args="--user ${user} --group ${group}"
-supervise_daemon_args="--user ${user} --group ${group}"
-
-: ${supervisor:=supervise-daemon}
-: ${stdout:=/dev/null}
-: ${stderr:=/dev/null}
-: ${respawn_delay:=10}
-: ${respawn_max:=5}
-: ${respawn_period:=1800}
-
-: ${osd_respawn_delay:=15}
-: ${osd_respawn_max:=10}
-
-: ${radosgw_respawn_max:=5}
-: ${radosgw_respawn_period:=30}
-
-depend() {
-	use dns logger
-	after net ntpd ntp-client chronyd
-	before netmount
-}
-
-is_type_valid() {
-	case ${daemon_type} in
-		mon|mds|osd|mgr|radosgw) return 0;;
-		*) return 1;;
-	esac
-}
-
-start_pre() {
-	export CEPH_CONF="${ceph_conf}"
-
-	checkpath -d -q -o "${user}:${group}" "${rundir}"
-
-	if ! is_type_valid ;then
-		eerror "Please give valid Ceph Server Type: mds, mon, osd"
-		return 1
-
-	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
-		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
-		return 1
-	fi
-	
-	local arg_name arg_val
-	for arg_name in std{out,err} respawn_{delay,max,period}; do
-		eval arg_val="\${${daemon_type}_${arg_name}}"
-
-		if [ -z "${arg_val}" ]; then
-			eval arg_val="\${${arg_name}}"
-		else
-			eval "${arg_name}=\"${arg_val}\""
-		fi
-
-		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
-			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log"
-		fi
-	done
-}
-
-reload() {
-	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
-	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
-	eend ${?}
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: