ceph 15.2.15 GA

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0001-blobstore.patch

@@ -1,51 +0,0 @@
---- ceph-13.2.1/src/spdk/lib/blob/blobstore.c.orig	2018-07-30 08:31:05.138254900 -0400
-+++ ceph-13.2.1/src/spdk/lib/blob/blobstore.c	2018-07-30 08:32:05.314254900 -0400
-@@ -393,7 +393,7 @@
- 	 * happen for example if a bogus blobid is passed in through open.
- 	 */
- 	if (blob->id != pages[0].id) {
--		SPDK_ERRLOG("Blobid (%lu) doesn't match what's in metadata (%lu)\n",
-+		SPDK_ERRLOG("Blobid (%llu) doesn't match what's in metadata (%llu)\n",
- 			    blob->id, pages[0].id);
- 		return -ENOENT;
- 	}
-@@ -2947,7 +2947,7 @@
- 
- /* START spdk_blob_resize */
- int
--spdk_blob_resize(struct spdk_blob *_blob, uint64_t sz)
-+spdk_blob_resize(struct spdk_blob *_blob, size_t sz)
- {
- 	struct spdk_blob_data	*blob = __blob_to_data(_blob);
- 	int			rc;
---- ceph-13.2.1/src/spdk/lib/lvol/lvol.c.orig	2018-07-30 09:08:38.137254900 -0400
-+++ ceph-13.2.1/src/spdk/lib/lvol/lvol.c	2018-07-30 09:10:09.642254900 -0400
-@@ -970,7 +970,7 @@
- 	num_clusters = divide_round_up(sz, spdk_bs_get_cluster_size(bs));
- 	free_clusters = spdk_bs_free_cluster_count(bs);
- 	if (num_clusters > free_clusters) {
--		SPDK_ERRLOG("Not enough free clusters left (%zu) on lvol store to add lvol %zu clusters\n",
-+		SPDK_ERRLOG("Not enough free clusters left (%llu) on lvol store to add lvol %llu clusters\n",
- 			    free_clusters, num_clusters);
- 		return -ENOMEM;
- 	}
-@@ -1026,7 +1026,7 @@
- 	if (new_clusters > used_clusters) {
- 		/* Check if there is enough clusters left to resize */
- 		if (new_clusters - used_clusters > free_clusters) {
--			SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %zu clusters\n", sz);
-+			SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %llu clusters\n", sz);
- 			return -ENOMEM;
- 		}
- 	}
---- ceph-13.2.1/src/spdk/lib/event/reactor.c.orig	2018-07-30 09:44:01.514254900 -0400
-+++ ceph-13.2.1/src/spdk/lib/event/reactor.c	2018-07-30 09:45:02.291254900 -0400
-@@ -651,7 +651,7 @@
- 	char mempool_name[32];
- 
- 	socket_mask = spdk_reactor_get_socket_mask();
--	SPDK_NOTICELOG("Occupied cpu socket mask is 0x%lx\n", socket_mask);
-+	SPDK_NOTICELOG("Occupied cpu socket mask is 0x%" PRIx64 "\n", socket_mask);
- 
- 	for (i = 0; i < SPDK_MAX_SOCKET; i++) {
- 		if ((1ULL << i) & socket_mask) {

0001-src-common-crc32c_intel_fast.patch

@@ -0,0 +1,228 @@
+--- ceph-15.2.4/src/yasm-wrapper.orig	2020-06-30 11:40:51.000000000 -0400
++++ ceph-15.2.4/src/yasm-wrapper	2020-07-20 12:21:34.574980869 -0400
+@@ -1,10 +1,11 @@
+-#!/bin/sh -e
++#!/bin/sh
+ 
+ # libtool and yasm do not get along.
+ # filter out any crap that libtool feeds us that yasm does not understand.
+ #echo $0: got $*
+ new=""
+ touch=""
++object=""
+ while [ -n "$*" ]; do
+     case "$1" in
+ 	-f )
+@@ -29,6 +30,12 @@
+ 	    touch="$1"
+ 	    shift
+ 	    ;;
++	-o )
++	    shift
++	    object="$1"
++	    new="$new -o $1"
++	    shift
++	    ;;
+ 	* )
+ 	    new="$new $1"
+ 	    shift
+@@ -36,8 +43,15 @@
+     esac
+ done
+ 
+-#echo $0: yasm $new
+-yasm $new
++#echo ${0}: yasm ${new}
++yasm ${new}
++
++echo ${new} | grep -- "crc32c_intel_fast*asm\.s"
++if [ $? -ne 0 ]; then
++    touch /tmp/${object}
++    ld -r -z ibt -z shstk -z noexecstack -o ${object}.tmp ${object}
++    mv ${object}.tmp ${object}
++fi
+ 
+ [ -n "$touch" ] && touch $touch
+ 
+--- ceph-15.2.2/src/common/crc32c_intel_fast_asm.s.orig	2020-05-26 08:34:32.226201974 -0400
++++ ceph-15.2.2/src/common/crc32c_intel_fast_asm.s	2020-05-26 17:19:20.327201974 -0400
+@@ -1,5 +1,5 @@
+ ;
+-; Copyright 2012-2013 Intel Corporation All Rights Reserved.
++; Copyright 2012-2015 Intel Corporation All Rights Reserved.
+ ; All rights reserved.
+ ;
+ ; http://opensource.org/licenses/BSD-3-Clause
+@@ -59,16 +59,34 @@
+ 	xor     rbx, rbx                ;; rbx = crc1 = 0;
+ 	xor     r10, r10                ;; r10 = crc2 = 0;
+ 
++	cmp	len, %%bSize*3*2
++	jbe	%%non_prefetch
++
+  %assign i 0
+  %rep %%bSize/8 - 1
+-	crc32   rax, [bufptmp+i + 0*%%bSize]  ;; update crc0
+-	crc32   rbx, [bufptmp+i + 1*%%bSize]  ;; update crc1
+-	crc32   r10, [bufptmp+i + 2*%%bSize]  ;; update crc2
++ %if i < %%bSize*3/4
++	prefetchnta	[bufptmp+ %%bSize*3 + i*4]
++ %endif
++	crc32   rax, qword [bufptmp+i + 0*%%bSize]  ;; update crc0
++	crc32   rbx, qword [bufptmp+i + 1*%%bSize]  ;; update crc1
++	crc32   r10, qword [bufptmp+i + 2*%%bSize]  ;; update crc2
+ 	%assign i (i+8)
+  %endrep
+-	crc32   rax, [bufptmp+i + 0*%%bSize]  ;; update crc0
+-	crc32   rbx, [bufptmp+i + 1*%%bSize]  ;; update crc1
+-; SKIP  ;crc32  r10, [bufptmp+i + 2*%%bSize]  ;; update crc2
++	jmp %%next %+ %1
++
++%%non_prefetch:
++ %assign i 0
++ %rep %%bSize/8 - 1
++	crc32   rax, qword [bufptmp+i + 0*%%bSize]  ;; update crc0
++	crc32   rbx, qword [bufptmp+i + 1*%%bSize]  ;; update crc1
++	crc32  r10, qword [bufptmp+i + 2*%%bSize]  ;; update crc2
++	%assign i (i+8)
++ %endrep
++
++%%next %+ %1:
++	crc32   rax, qword [bufptmp+i + 0*%%bSize]  ;; update crc0
++	crc32   rbx, qword [bufptmp+i + 1*%%bSize]  ;; update crc1
++; SKIP	;crc32  r10, qword [bufptmp+i + 2*%%bSize]  ;; update crc2
+ 
+ 	; merge in crc0
+ 	movzx   bufp_dw, al
+@@ -180,12 +198,15 @@
+ %define crc_init_dw     r8d 
+ %endif
+ 
+-
++	endbranch
+ 	push    rdi
+ 	push    rbx
+ 
+ 	mov     rax, crc_init           ;; rax = crc_init;
+ 
++	cmp	len, 8
++	jb	less_than_8
++
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; 1) ALIGN: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+@@ -195,9 +216,6 @@
+ 					;; amount of the address
+ 	je      proc_block              ;; Skip if aligned
+ 
+-	cmp     len, 8
+-	jb      less_than_8
+-
+ 	;;;; Calculate CRC of unaligned bytes of the buffer (if any) ;;;;
+ 	mov     rbx, [bufptmp]          ;; load a quadword from the buffer
+ 	add     bufptmp, bufp           ;; align buffer pointer for
+@@ -233,7 +251,7 @@
+ 	jnc     bit7                    ;; jump to bit-6 if bit-7 == 0
+  %assign i 0
+  %rep 16
+-	crc32   rax, [bufptmp+i]        ;; compute crc32 of 8-byte data
++	crc32   rax, qword [bufptmp+i]  ;; compute crc32 of 8-byte data
+ 	%assign i (i+8)
+  %endrep
+ 	je      do_return               ;; return if remaining data is zero
+@@ -244,7 +262,7 @@
+ 	jnc     bit6                    ;; jump to bit-6 if bit-7 == 0
+  %assign i 0
+  %rep 8
+-	crc32   rax, [bufptmp+i]        ;; compute crc32 of 8-byte data
++	crc32   rax, qword [bufptmp+i]  ;; compute crc32 of 8-byte data
+ 	%assign i (i+8)
+  %endrep
+ 	je      do_return               ;; return if remaining data is zero
+@@ -254,7 +272,7 @@
+ 	jnc     bit5                    ;; jump to bit-5 if bit-6 == 0
+  %assign i 0
+  %rep 4
+-	crc32   rax, [bufptmp+i]        ;;    compute crc32 of 8-byte data
++	crc32   rax, qword [bufptmp+i]  ;;    compute crc32 of 8-byte data
+ 	%assign i (i+8)
+  %endrep
+ 	je      do_return               ;; return if remaining data is zero
+@@ -264,7 +282,7 @@
+ 	jnc     bit4                    ;; jump to bit-4 if bit-5 == 0
+  %assign i 0
+  %rep 2
+-	crc32   rax, [bufptmp+i]        ;;    compute crc32 of 8-byte data
++	crc32   rax, qword [bufptmp+i]  ;;    compute crc32 of 8-byte data
+ 	%assign i (i+8)
+  %endrep
+ 	je      do_return               ;; return if remaining data is zero
+@@ -272,11 +290,11 @@
+ bit4:
+ 	shl     len_b, 1                ;; shift-out MSB (bit-4)
+ 	jnc     bit3                    ;; jump to bit-3 if bit-4 == 0
+-	crc32   rax, [bufptmp]          ;; compute crc32 of 8-byte data
++	crc32   rax, qword [bufptmp]    ;; compute crc32 of 8-byte data
+ 	je      do_return               ;; return if remaining data is zero
+ 	add     bufptmp, 8              ;; buf +=8; (next 8 bytes)
+ bit3:
+-	mov     rbx, [bufptmp]          ;; load a 8-bytes from the buffer:
++	mov     rbx, qword [bufptmp]    ;; load a 8-bytes from the buffer:
+ 	shl     len_b, 1                ;; shift-out MSB (bit-3)
+ 	jnc     bit2                    ;; jump to bit-2 if bit-3 == 0
+ 	crc32   eax, ebx                ;; compute crc32 of 4-byte data
+--- ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s.orig	2020-05-26 08:34:32.226201974 -0400
++++ ceph-15.2.2/src/common/crc32c_intel_fast_zero_asm.s	2020-05-26 17:19:32.497201974 -0400
+@@ -1,5 +1,5 @@
+ ;
+-; Copyright 2012-2013 Intel Corporation All Rights Reserved.
++; Copyright 2012-2015 Intel Corporation All Rights Reserved.
+ ; All rights reserved.
+ ;
+ ; http://opensource.org/licenses/BSD-3-Clause
+@@ -59,6 +59,19 @@
+ 	xor     rbx, rbx                ;; rbx = crc1 = 0;
+ 	xor     r10, r10                ;; r10 = crc2 = 0;
+ 
++	cmp	len, %%bSize*3*2
++	jbe	%%non_prefetch
++
++ %assign i 0
++ %rep %%bSize/8 - 1
++	crc32   rax, bufptmp  ;; update crc0
++	crc32   rbx, bufptmp  ;; update crc1
++	crc32   r10, bufptmp  ;; update crc2
++	%assign i (i+8)
++ %endrep
++	jmp %%next %+ %1
++
++%%non_prefetch:
+  %assign i 0
+  %rep %%bSize/8 - 1
+ 	crc32   rax, bufptmp  ;; update crc0
+@@ -66,6 +79,8 @@
+ 	crc32   r10, bufptmp  ;; update crc2
+ 	%assign i (i+8)
+  %endrep
++
++%%next %+ %1:
+ 	crc32   rax, bufptmp  ;; update crc0
+ 	crc32   rbx, bufptmp  ;; update crc1
+ ; SKIP  ;crc32  r10, bufptmp  ;; update crc2
+@@ -180,12 +195,15 @@
+ %define crc_init_dw     r8d
+ %endif
+ 
+-
++	endbranch
+ 	push    rdi
+ 	push    rbx
+ 
+ 	mov     rax, crc_init           ;; rax = crc_init;
+ 
++	cmp	len, 8
++	jb	less_than_8
++
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; 1) ALIGN: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 

0001-src-rocksdb-util-murmurhash.patch

@@ -1,13 +0,0 @@
---- ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc	2017-04-27 01:13:46.000000000 +0100
-+++ ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc	2017-07-25 11:37:28.910266684 +0100
-@@ -113,8 +113,8 @@ unsigned int MurmurHash2 ( const void *
- 
-     switch(len)
-     {
--    case 3: h ^= data[2] << 16;
--    case 2: h ^= data[1] << 8;
-+    case 3: h ^= data[2] << 16; // fallthrough
-+    case 2: h ^= data[1] << 8; // fallthrough
-     case 1: h ^= data[0];
-         h *= m;
-     };

0002-cmake-Support-ppc64.patch

@@ -1,127 +0,0 @@
-From 2f0a7153460acc3f21462236f470ec3471fa2ee1 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 31 Jul 2017 19:50:23 +0200
-Subject: [PATCH] cmake: Support ppc64
-
-The ppc64 support requires a couple of changes:
-- adding the ppc64 support to cmake
-- changing optimized crc32 code to compile on ppc64le only
-- moving ifdef condition before crc32_align to avoid defined but not
-used warning
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- cmake/modules/SIMDExt.cmake | 15 ++++++++++++++-
- src/CMakeLists.txt          |  4 +++-
- src/arch/ppc.c              |  8 ++++----
- src/common/crc32c_ppc.c     |  6 +++---
- 4 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/SIMDExt.cmake b/cmake/modules/SIMDExt.cmake
-index 5330835..c47667d 100644
---- a/cmake/modules/SIMDExt.cmake
-+++ b/cmake/modules/SIMDExt.cmake
-@@ -109,7 +109,20 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
-   endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64le")
-   set(HAVE_PPC64LE 1)
--  message(STATUS " we are ppc64le")
-+  message(STATUS " we are ppc64")
-+  CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
-+  if(HAS_ALTIVEC)
-+    message(STATUS " HAS_ALTIVEC yes")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -maltivec")
-+  endif()
-+  CHECK_C_COMPILER_FLAG("-mcpu=power8" HAVE_POWER8)
-+  if(HAVE_POWER8)
-+    message(STATUS " HAVE_POWER8 yes")
-+  endif()
-+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(power|ppc)64")
-+  set(HAVE_PPC64 1)
-+  message(STATUS " we are ppc64")
-   CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
-   if(HAS_ALTIVEC)
-     message(STATUS " HAS_ALTIVEC yes")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 66f0c14..38d1913 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -568,7 +568,9 @@ if(HAVE_INTEL)
-   endif(HAVE_GOOD_YASM_ELF64)
- elseif(HAVE_POWER8)
-   list(APPEND libcommon_files
--    common/crc32c_ppc.c
-+    common/crc32c_ppc.c)
-+elseif(HAVE_PPC64LE)
-+  list(APPEND libcommon_files
-     common/crc32c_ppc_asm.S
-     common/crc32c_ppc_fast_zero_asm.S)
- endif(HAVE_INTEL)
-diff --git a/src/arch/ppc.c b/src/arch/ppc.c
-index f21e2fe..11d3a49 100644
---- a/src/arch/ppc.c
-+++ b/src/arch/ppc.c
-@@ -14,10 +14,10 @@ int ceph_arch_ppc_crc32 = 0;
- 
- #include <stdio.h>
- 
--#if __linux__ && __powerpc64__
-+#ifdef HAVE_PPC64LE
- #include <sys/auxv.h>
- #include <asm/cputable.h>
--#endif /* __linux__ && __powerpc64__ */
-+#endif /* HAVE_PPC64LE */
- 
- #ifndef PPC_FEATURE2_VEC_CRYPTO
- #define PPC_FEATURE2_VEC_CRYPTO		0x02000000
-@@ -31,9 +31,9 @@ int ceph_arch_ppc_probe(void)
- {
-   ceph_arch_ppc_crc32 = 0;
- 
--#if __linux__ && __powerpc64__
-+#ifdef HAVE_PPC64LE
-   if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) ceph_arch_ppc_crc32 = 1;
--#endif /* __linux__ && __powerpc64__ */
-+#endif /* HAVE_PPC64LE */
- 
-   return 0;
- }
-diff --git a/src/common/crc32c_ppc.c b/src/common/crc32c_ppc.c
-index 43756e2..52fd1c4 100644
---- a/src/common/crc32c_ppc.c
-+++ b/src/common/crc32c_ppc.c
-@@ -20,6 +20,7 @@
- #define VMX_ALIGN	16
- #define VMX_ALIGN_MASK	(VMX_ALIGN-1)
- 
-+#ifdef HAVE_PPC64LE
- #ifdef REFLECT
- static unsigned int crc32_align(unsigned int crc, unsigned char const *p,
-                                 unsigned long len)
-@@ -38,7 +39,6 @@ static unsigned int crc32_align(unsigned int crc, unsigned char const *p,
- }
- #endif
- 
--#ifdef HAVE_POWER8
- static inline unsigned long polynomial_multiply(unsigned int a, unsigned int b) {
-         vector unsigned int va = {a, 0, 0, 0};
-         vector unsigned int vb = {b, 0, 0, 0};
-@@ -134,7 +134,7 @@ uint32_t ceph_crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len)
-   return crc;
- }
- 
--#else /* HAVE_POWER8 */
-+#else /* HAVE_PPC64LE */
- 
- /* This symbol has to exist on non-ppc architectures (and on legacy
-  * ppc systems using power7 or below) in order to compile properly
-@@ -145,4 +145,4 @@ uint32_t ceph_crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len)
-   return 0;
- }
- 
--#endif /* HAVE_POWER8 */
-+#endif /* HAVE_PPC64LE */
--- 
-2.9.4
-

0002-src-common-CMakeLists.txt.patch

@@ -0,0 +1,13 @@
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index 65ba10b0f1..eeedc29c37 100644
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
+     crc32c_aarch64.c)
+ endif(HAVE_INTEL)
+ 
+-add_library(crc32 ${crc32_srcs})
++add_library(crc32 STATIC ${crc32_srcs})
+ if(HAVE_ARMV8_CRC)
+   set_target_properties(crc32 PROPERTIES
+     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")

0003-librbd-Conditionally-import-TrimRequest.cc.patch

@@ -1,31 +0,0 @@
-From 74a754690736f6608b0d4d9c807df0bd777a129d Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Fri, 8 Dec 2017 00:21:38 +0100
-Subject: [PATCH] librbd: Conditionally import TrimRequest.cc
-
-We include TrimRequest.cc in librbd tests at two places:
- - operation/test_mock_TrimRequest.cc
- - operation/test_mock_ResizeRequest.cc
-
-That causes linking errors when doing the builds because some of the
-structures are defined twice.
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- src/librbd/operation/TrimRequest.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc
-index 28f2deb..929ca51 100644
---- a/src/librbd/operation/TrimRequest.cc
-+++ b/src/librbd/operation/TrimRequest.cc
-@@ -362,4 +362,6 @@ void TrimRequest<I>::send_finish(int r) {
- } // namespace operation
- } // namespace librbd
- 
-+#ifndef TEST_F
- template class librbd::operation::TrimRequest<librbd::ImageCtx>;
-+#endif
--- 
-2.9.5
-

0003-src-common-bitstr.h.patch

@@ -0,0 +1,21 @@
+--- ceph-15.1.0/src/common/bit_str.h.orig	2020-02-03 09:47:20.047149798 -0500
++++ ceph-15.1.0/src/common/bit_str.h	2020-02-03 09:47:50.213149798 -0500
+@@ -17,6 +17,7 @@
+ #include <cstdint>
+ #include <iosfwd>
+ #include <functional>
++#include <ostream>
+ 
+ namespace ceph {
+   class Formatter;
+--- ceph-15.2.4/src/global/signal_handler.h.orig        2020-07-17 12:57:54.763628429 -0400
++++ ceph-15.2.4/src/global/signal_handler.h     2020-07-17 12:58:10.610628429 -0400
+@@ -16,6 +16,8 @@
+ #define CEPH_GLOBAL_SIGNAL_HANDLER_H
+
+ #include <signal.h>
++#include <string>
++
+ #include "acconfig.h"
+
+ typedef void (*signal_handler_t)(int);

0005-src-rocksdb-table-block.h.patch

@@ -1,155 +0,0 @@
---- ceph-12.2.3/src/rocksdb/table/block.h.orig	2018-02-22 07:49:38.044899631 -0500
-+++ ceph-12.2.3/src/rocksdb/table/block.h	2018-02-22 07:58:55.855899631 -0500
-@@ -65,7 +65,8 @@
- 
-     // Create bitmap and set all the bits to 0
-     bitmap_ = new std::atomic<uint32_t>[bitmap_size];
--    memset(bitmap_, 0, bitmap_size * kBytesPersEntry);
-+    // memset(bitmap_, 0, bitmap_size * kBytesPersEntry);
-+    { unsigned i = 0; for (; i < bitmap_size;) bitmap_[i++] = 0; }
- 
-     RecordTick(GetStatistics(), READ_AMP_TOTAL_READ_BYTES,
-                num_bits_needed << bytes_per_bit_pow_);
---- ceph-12.2.3/src/rocksdb/db/c.cc.orig	2018-02-22 08:14:56.033899631 -0500
-+++ ceph-12.2.3/src/rocksdb/db/c.cc	2018-02-22 10:06:39.759899631 -0500
-@@ -1322,11 +1322,6 @@
-   b->rep.PutLogData(Slice(blob, len));
- }
- 
--void rocksdb_writebatch_iterate(
--    rocksdb_writebatch_t* b,
--    void* state,
--    void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
--    void (*deleted)(void*, const char* k, size_t klen)) {
-   class H : public WriteBatch::Handler {
-    public:
-     void* state_;
-@@ -1339,6 +1334,12 @@
-       (*deleted_)(state_, key.data(), key.size());
-     }
-   };
-+
-+void rocksdb_writebatch_iterate(
-+    rocksdb_writebatch_t* b,
-+    void* state,
-+    void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
-+    void (*deleted)(void*, const char* k, size_t klen)) {
-   H handler;
-   handler.state_ = state;
-   handler.put_ = put;
-@@ -1579,18 +1580,6 @@
-     void* state,
-     void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
-     void (*deleted)(void*, const char* k, size_t klen)) {
--  class H : public WriteBatch::Handler {
--   public:
--    void* state_;
--    void (*put_)(void*, const char* k, size_t klen, const char* v, size_t vlen);
--    void (*deleted_)(void*, const char* k, size_t klen);
--    virtual void Put(const Slice& key, const Slice& value) override {
--      (*put_)(state_, key.data(), key.size(), value.data(), value.size());
--    }
--    virtual void Delete(const Slice& key) override {
--      (*deleted_)(state_, key.data(), key.size());
--    }
--  };
-   H handler;
-   handler.state_ = state;
-   handler.put_ = put;
-@@ -2532,13 +2521,9 @@
-   delete filter;
- }
- 
--rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
--  // Make a rocksdb_filterpolicy_t, but override all of its methods so
--  // they delegate to a NewBloomFilterPolicy() instead of user
--  // supplied C functions.
--  struct Wrapper : public rocksdb_filterpolicy_t {
-+  struct WrapperFP : public rocksdb_filterpolicy_t {
-     const FilterPolicy* rep_;
--    ~Wrapper() { delete rep_; }
-+    ~WrapperFP() { delete rep_; }
-     const char* Name() const override { return rep_->Name(); }
-     void CreateFilter(const Slice* keys, int n,
-                       std::string* dst) const override {
-@@ -2549,11 +2534,16 @@
-     }
-     static void DoNothing(void*) { }
-   };
--  Wrapper* wrapper = new Wrapper;
-+
-+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
-+  // Make a rocksdb_filterpolicy_t, but override all of its methods so
-+  // they delegate to a NewBloomFilterPolicy() instead of user
-+  // supplied C functions.
-+  WrapperFP* wrapper = new WrapperFP;
-   wrapper->rep_ = NewBloomFilterPolicy(bits_per_key, original_format);
-   wrapper->state_ = nullptr;
-   wrapper->delete_filter_ = nullptr;
--  wrapper->destructor_ = &Wrapper::DoNothing;
-+  wrapper->destructor_ = &WrapperFP::DoNothing;
-   return wrapper;
- }
- 
-@@ -2889,10 +2879,9 @@
-   delete st;
- }
- 
--rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t prefixLen) {
--  struct Wrapper : public rocksdb_slicetransform_t {
-+  struct WrapperST : public rocksdb_slicetransform_t {
-     const SliceTransform* rep_;
--    ~Wrapper() { delete rep_; }
-+    ~WrapperST() { delete rep_; }
-     const char* Name() const override { return rep_->Name(); }
-     Slice Transform(const Slice& src) const override {
-       return rep_->Transform(src);
-@@ -2903,31 +2892,20 @@
-     bool InRange(const Slice& src) const override { return rep_->InRange(src); }
-     static void DoNothing(void*) { }
-   };
--  Wrapper* wrapper = new Wrapper;
-+
-+rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t prefixLen) {
-+  WrapperST* wrapper = new WrapperST;
-   wrapper->rep_ = rocksdb::NewFixedPrefixTransform(prefixLen);
-   wrapper->state_ = nullptr;
--  wrapper->destructor_ = &Wrapper::DoNothing;
-+  wrapper->destructor_ = &WrapperST::DoNothing;
-   return wrapper;
- }
- 
- rocksdb_slicetransform_t* rocksdb_slicetransform_create_noop() {
--  struct Wrapper : public rocksdb_slicetransform_t {
--    const SliceTransform* rep_;
--    ~Wrapper() { delete rep_; }
--    const char* Name() const override { return rep_->Name(); }
--    Slice Transform(const Slice& src) const override {
--      return rep_->Transform(src);
--    }
--    bool InDomain(const Slice& src) const override {
--      return rep_->InDomain(src);
--    }
--    bool InRange(const Slice& src) const override { return rep_->InRange(src); }
--    static void DoNothing(void*) { }
--  };
--  Wrapper* wrapper = new Wrapper;
-+  WrapperST* wrapper = new WrapperST;
-   wrapper->rep_ = rocksdb::NewNoopTransform();
-   wrapper->state_ = nullptr;
--  wrapper->destructor_ = &Wrapper::DoNothing;
-+  wrapper->destructor_ = &WrapperST::DoNothing;
-   return wrapper;
- }
- 
---- ceph-12.2.3/src/rocksdb/memtable/inlineskiplist.h.orig	2018-02-22 10:34:06.918899631 -0500
-+++ ceph-12.2.3/src/rocksdb/memtable/inlineskiplist.h	2018-02-22 10:34:44.145899631 -0500
-@@ -279,7 +279,7 @@
-   // next_[0].  This is used for passing data from AllocateKey to Insert.
-   void StashHeight(const int height) {
-     assert(sizeof(int) <= sizeof(next_[0]));
--    memcpy(&next_[0], &height, sizeof(int));
-+    memcpy(static_cast<void*>(&next_[0]), &height, sizeof(int));
-   }
- 
-   // Retrieves the value passed to StashHeight.  Undefined after a call

0006-f30py3.patch

@@ -1,127 +0,0 @@
---- ceph-12.2.8/src/CMakeLists.txt.orig	2018-09-12 10:32:04.536254900 -0400
-+++ ceph-12.2.8/src/CMakeLists.txt	2018-09-12 10:32:22.454254900 -0400
-@@ -244,9 +244,6 @@
- endif()
- 
- # Python stuff
--find_package(PythonInterp 2 REQUIRED)
--find_package(PythonLibs 2 REQUIRED)
--
- option(WITH_PYTHON3 "build python3 bindings" "CHECK")
- if(WITH_PYTHON3 MATCHES "check|CHECK")
-   find_package(Python3Interp 3 QUIET)
---- ceph-12.2.8/src/pybind/CMakeLists.txt.orig	2018-09-12 10:45:44.057254900 -0400
-+++ ceph-12.2.8/src/pybind/CMakeLists.txt	2018-09-12 12:36:23.604254900 -0400
-@@ -6,7 +6,6 @@
- if(WITH_PYTHON3)
-   set(py_vers 3)
- endif()
--list(APPEND py_vers 2)
- 
- foreach(python_version ${py_vers})
-   if(${python_version} EQUAL 2)
-@@ -58,7 +57,7 @@
- 
- install(FILES
-   ${CMAKE_CURRENT_SOURCE_DIR}/ceph_rest_api.py
--  DESTINATION ${PYTHON_INSTDIR})
-+  DESTINATION ${PYTHON${PYTHON_VERSION}_INSTDIR})
- 
- if(WITH_MGR)
-   # Location needs to match default setting for mgr_module_path, currently:
---- ceph-12.2.8/src/tools/setup-virtualenv.sh.orig	2018-09-13 10:57:53.530254900 -0400
-+++ ceph-12.2.8/src/tools/setup-virtualenv.sh	2018-09-13 13:02:10.455254900 -0400
-@@ -15,10 +15,12 @@
- # GNU Library Public License for more details.
- #
- 
-+echo ====================== setup-virtualenv $DIR ================ 
-+
- DIR=$1
- rm -fr $DIR
- mkdir -p $DIR
--virtualenv --python python2.7 $DIR
-+virtualenv --python python3 $DIR
- . $DIR/bin/activate
- 
- if pip --help | grep -q disable-pip-version-check; then
---- ceph-12.2.8/src/ceph.in.orig	2018-09-13 13:16:24.181254900 -0400
-+++ ceph-12.2.8/src/ceph.in	2018-09-13 13:16:33.608254900 -0400
-@@ -1,4 +1,4 @@
--#!@PYTHON_EXECUTABLE@
-+#!@PYTHON3_EXECUTABLE@
- # -*- mode:python -*-
- # vim: ts=4 sw=4 smarttab expandtab
- #
-diff -ur ceph-12.2.5/src/brag/client/ceph-brag ceph-12.2.5-mod/src/brag/client/ceph-brag
---- ceph-12.2.5/src/brag/client/ceph-brag	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/brag/client/ceph-brag	2018-05-22 21:06:32.952813105 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from __future__ import print_function
- 
-diff -ur ceph-12.2.5/src/ceph-create-keys ceph-12.2.5-mod/src/ceph-create-keys
---- ceph-12.2.5/src/ceph-create-keys	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-create-keys	2018-05-22 21:09:49.103398176 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- import argparse
- import errno
- import json
-diff -ur ceph-12.2.5/src/ceph-detect-init/ceph_detect_init/main.py ceph-12.2.5-mod/src/ceph-detect-init/ceph_detect_init/main.py
---- ceph-12.2.5/src/ceph-detect-init/ceph_detect_init/main.py	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-detect-init/ceph_detect_init/main.py	2018-05-22 21:09:14.943993086 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- #
- # Copyright (C) 2015 <contact@redhat.com>
- # Copyright (C) 2015 SUSE LINUX GmbH
-diff -ur ceph-12.2.5/src/ceph-disk/ceph_disk/main.py ceph-12.2.5-mod/src/ceph-disk/ceph_disk/main.py
---- ceph-12.2.5/src/ceph-disk/ceph_disk/main.py	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-disk/ceph_disk/main.py	2018-05-22 21:11:02.606118074 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- #
- # Copyright (C) 2015, 2016, 2017 Red Hat <contact@redhat.com>
- # Copyright (C) 2014 Inktank <info@inktank.com>
-diff -ur ceph-12.2.5/src/ceph-rest-api ceph-12.2.5-mod/src/ceph-rest-api
---- ceph-12.2.5/src/ceph-rest-api	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-rest-api	2018-05-22 21:10:50.202334095 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # vim: ts=4 sw=4 smarttab expandtab
- 
- import argparse
-diff -ur ceph-12.2.5/src/ceph-volume/bin/ceph-volume ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume
---- ceph-12.2.5/src/ceph-volume/bin/ceph-volume	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume	2018-05-22 21:07:43.104592535 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from ceph_volume import main
- 
-diff -ur ceph-12.2.5/src/ceph-volume/bin/ceph-volume-systemd ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume-systemd
---- ceph-12.2.5/src/ceph-volume/bin/ceph-volume-systemd	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume-systemd	2018-05-22 21:07:46.628531163 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from ceph_volume.systemd import main
- 
-diff -ur ceph-12.2.5/src/mount.fuse.ceph ceph-12.2.5-mod/src/mount.fuse.ceph
---- ceph-12.2.5/src/mount.fuse.ceph	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/mount.fuse.ceph	2018-05-22 21:08:06.355187609 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- '''
- Helper to mount ceph-fuse from /etc/fstab.  To use, add an entry
- like:

0007-src-osd-PrimaryLogPG.cc.patch

@@ -1,19 +0,0 @@
---- ceph-12.2.9/src/osd/PrimaryLogPG.cc.orig	2018-10-29 09:12:57.766116270 -0400
-+++ ceph-12.2.9/src/osd/PrimaryLogPG.cc	2018-10-29 09:32:37.146116270 -0400
-@@ -20,6 +20,7 @@
- #include "PG.h"
- #include "PrimaryLogPG.h"
- #include "OSD.h"
-+#include <algorithm>
- #include "OpRequest.h"
- #include "ScrubStore.h"
- #include "Session.h"
-@@ -1586,7 +1587,7 @@
-       pg_log.get_log().approx_size() > target) {
-     dout(10) << __func__ << " approx pg log length =  "
-              << pg_log.get_log().approx_size() << dendl;
--    size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
-+    size_t num_to_trim = std::min<uint64_t>(pg_log.get_log().approx_size() - target,
- 				  cct->_conf->osd_pg_log_trim_max);
-     dout(10) << __func__ << " num_to_trim =  " << num_to_trim << dendl;
-     if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&

cmake-modules-BuildBoost.cmake.noautopatch

@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
+index 2e92132366..3cb1e3d958 100644
+--- a/cmake/modules/BuildBoost.cmake
++++ b/cmake/modules/BuildBoost.cmake
+@@ -62,7 +62,7 @@ function(do_build_boost version)
+   else()
+     list(APPEND boost_features "address-model=32")
+   endif()
+-  set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
++  set(BOOST_CXXFLAGS "-fPIC -w -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -ftemplate-depth-1024 -fno-new-ttp-matching -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") # check on arm, etc <---XXX
+   list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
+ 
+   set(boost_with_libs)

sources

@@ -1 +1 @@
-SHA512 (ceph-12.2.9.tar.gz) = 93da6f9012fdb65e74dc1917f54839cb19a25672d53e7ee253553e93abb1a2afb51cd18b27bc82559108e2085e463a3b46003b03627e06a6e2e2312b54d86e92
+SHA512 (ceph-15.2.15.tar.gz) = e4d929ffda5c3e31767d93340fb97b5d49ca1d5641f6c30134ce5542486fc4f72684aef2ef47cb940a332e8b9144d8cec63ce8a9f86c773dbc0ccebdd8e7fb19