Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Boris Ranto
|
de8bfba2ef | ||
|
Dan Horák
|
f71517fa89 | ||
|
Boris Ranto
|
d84f5c5288 | ||
|
Boris Ranto
|
8d46a4a552 |
@@ -1,13 +0,0 @@
|
||||
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}")
|
||||
@@ -1,13 +0,0 @@
|
||||
--- ceph-14.2.6/src/common/bit_str.h.orig 2020-01-24 11:37:20.547679336 -0500
|
||||
+++ ceph-14.2.6/src/common/bit_str.h 2020-01-24 11:37:55.351904895 -0500
|
||||
@@ -14,7 +14,10 @@
|
||||
#ifndef CEPH_COMMON_BIT_STR_H
|
||||
#define CEPH_COMMON_BIT_STR_H
|
||||
|
||||
+#include <cstdint>
|
||||
+#include <iosfwd>
|
||||
#include <functional>
|
||||
+#include <ostream>
|
||||
|
||||
namespace ceph {
|
||||
class Formatter;
|
||||
@@ -1,10 +0,0 @@
|
||||
--- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig 2020-01-24 12:39:23.738816885 -0500
|
||||
+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h 2020-01-24 12:39:36.522902386 -0500
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "include/rados/librados_fwd.hpp"
|
||||
|
||||
#include <map>
|
||||
+#include <string>
|
||||
|
||||
namespace librbd {
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
--- a/cmake/modules/CheckCxxAtomic.cmake 2020-03-02 12:49:20.000000000 -0500
|
||||
+++ b/cmake/modules/CheckCxxAtomic.cmake 2020-01-29 12:53:56.952149798 -0500
|
||||
@@ -10,18 +10,29 @@
|
||||
check_cxx_source_compiles("
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
+
|
||||
+#if __s390x__
|
||||
+// Boost needs 16-byte atomics for tagged pointers.
|
||||
+// These are implemented via inline instructions on the platform
|
||||
+// if 16-byte alignment can be proven, and are delegated to libatomic
|
||||
+// library routines otherwise. Whether or not alignment is provably
|
||||
+// OK for a std::atomic unfortunately depends on compiler version and
|
||||
+// optimization levels, and also on the details of the expression.
|
||||
+// We specifically test access via an otherwise unknown pointer here
|
||||
+// to ensure we get the most complex case. If this access can be
|
||||
+// done without libatomic, then all accesses can be done.
|
||||
+bool atomic16(std::atomic<unsigned __int128> *ptr)
|
||||
+{
|
||||
+ return *ptr != 0;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
int main() {
|
||||
std::atomic<uint8_t> w1;
|
||||
std::atomic<uint16_t> w2;
|
||||
std::atomic<uint32_t> w4;
|
||||
std::atomic<uint64_t> w8;
|
||||
-#ifdef __s390x__
|
||||
- // Boost needs 16-byte atomics for tagged pointers.
|
||||
- std::atomic<unsigned __int128> w16;
|
||||
-#else
|
||||
- #define w16 0
|
||||
-#endif
|
||||
- return w1 + w2 + w4 + w8 + w16;
|
||||
+ return w1 + w2 + w4 + w8;
|
||||
}
|
||||
" ${var})
|
||||
endfunction(check_cxx_atomics)
|
||||
@@ -0,0 +1,13 @@
|
||||
--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig 2014-08-15 16:05:00.161794290 +0200
|
||||
+++ ceph-0.80.5/src/perfglue/heap_profiler.cc 2014-08-15 16:05:04.691794305 +0200
|
||||
@@ -12,8 +12,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#include <google/heap-profiler.h>
|
||||
-#include <google/malloc_extension.h>
|
||||
+#include <gperftools/heap-profiler.h>
|
||||
+#include <gperftools/malloc_extension.h>
|
||||
#include "heap_profiler.h"
|
||||
#include "common/environment.h"
|
||||
#include "common/LogClient.h"
|
||||
@@ -0,0 +1,11 @@
|
||||
--- ceph-0.80.5/src/test/Makefile.am.orig 2014-08-15 16:30:18.831799418 +0200
|
||||
+++ ceph-0.80.5/src/test/Makefile.am 2014-08-15 16:23:17.758464663 +0200
|
||||
@@ -642,7 +642,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
|
||||
if LINUX
|
||||
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
|
||||
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
|
||||
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
|
||||
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
|
||||
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 369daeeb447154016f774d16f1b618cdaaf575d5 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Fri, 31 Oct 2014 03:27:46 +0100
|
||||
Subject: [PATCH] Remove systemd detection in ceph init script, rhbz#1157938
|
||||
|
||||
---
|
||||
src/init-ceph.in | 10 +---------
|
||||
1 file changed, 1 insertion(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/init-ceph.in b/src/init-ceph.in
|
||||
index 95723b0..1effb56 100644
|
||||
--- a/src/init-ceph.in
|
||||
+++ b/src/init-ceph.in
|
||||
@@ -44,10 +44,6 @@ test -f $LIBDIR/ceph_common.sh || exit 0
|
||||
|
||||
EXIT_STATUS=0
|
||||
|
||||
-# detect systemd
|
||||
-SYSTEMD=0
|
||||
-grep -qs systemd /proc/1/comm && SYSTEMD=1
|
||||
-
|
||||
signal_daemon() {
|
||||
name=$1
|
||||
daemon=$2
|
||||
@@ -276,11 +272,7 @@ for name in $what; do
|
||||
[ -n "$wrap" ] && runmode="-f &" && runarg="-f"
|
||||
[ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
|
||||
|
||||
- if [ $SYSTEMD -eq 1 ]; then
|
||||
- cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
|
||||
- else
|
||||
- cmd="$files $wrap $cmd --cluster $cluster $runmode"
|
||||
- fi
|
||||
+ cmd="$files $wrap $cmd --cluster $cluster $runmode"
|
||||
|
||||
if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
|
||||
get_conf pre_mount "true" "pre mount command"
|
||||
--
|
||||
1.9.3
|
||||
|
||||
Reference in New Issue
Block a user