Compare commits
53 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eb28854f14 | |||
| 0de8065f06 | |||
| ffa151c1c9 | |||
| f003c36523 | |||
| a11242cdd6 | |||
| 8efc832c79 | |||
| 2288029bf6 | |||
| a2502bdf58 | |||
| 7fc18b8c1c | |||
| 824fa68a8c | |||
| c342c970d9 | |||
| 680c925719 | |||
| ceab65be90 | |||
| fa9e04a7d1 | |||
| 8d319bc7a9 | |||
| f3e716bd25 | |||
| 6af5c6e496 | |||
| 50ab9b56e2 | |||
| 20b0b2e68e | |||
| dadf49c482 | |||
| e5a890ade4 | |||
| 49e681f424 | |||
| a5a738d622 | |||
| 9ca188d404 | |||
| bde7d230a8 | |||
| 767c6bb311 | |||
| b32301bd4a | |||
| 6d2e42e155 | |||
| 5e7cff58f4 | |||
| 9206f82772 | |||
| 22d0a9bd96 | |||
| 2b0909dfd6 | |||
| 68971661e7 | |||
| bcc7f226bb | |||
| 3d553afe27 | |||
| 6bc9cadd59 | |||
| 8d2c0a023a | |||
| 7e0cdd887f | |||
| 4ac65e9e96 | |||
| ac5a29a8ad | |||
| 222abd2152 | |||
| bb85c64a3d | |||
| 09905ca683 | |||
| b7119dde1d | |||
| 9b5287b8d1 | |||
| 94d715c6db | |||
| c767eafe44 | |||
| 300509739c | |||
| bedf031a7d | |||
| 2a379f1396 | |||
| a6871cb0d5 | |||
| 2a0aaf952c | |||
| 84aa853323 |
@@ -0,0 +1,47 @@
|
||||
From 2a7810f39cb113570efcde5f65e5440ff9587ae0 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 11 Nov 2015 17:08:06 +0100
|
||||
Subject: [PATCH] Disable erasure_codelib neon build
|
||||
|
||||
---
|
||||
src/erasure-code/jerasure/Makefile.am | 6 +++---
|
||||
src/erasure-code/shec/Makefile.am | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
|
||||
index 6ffe3ed..01f5112 100644
|
||||
--- a/src/erasure-code/jerasure/Makefile.am
|
||||
+++ b/src/erasure-code/jerasure/Makefile.am
|
||||
@@ -75,9 +75,9 @@ if LINUX
|
||||
libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
+#endif
|
||||
|
||||
libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
|
||||
libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
|
||||
index cd93132..948979b 100644
|
||||
--- a/src/erasure-code/shec/Makefile.am
|
||||
+++ b/src/erasure-code/shec/Makefile.am
|
||||
@@ -81,9 +81,9 @@ if LINUX
|
||||
libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
+#endif
|
||||
|
||||
libec_shec_sse3_la_SOURCES = ${shec_sources}
|
||||
libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 69e888fa5c103588ee9f23ac4cec4bfc2285eb08 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Fri, 13 Jan 2017 01:15:42 +0100
|
||||
Subject: [PATCH] hack: do not test for libxfs, assume it is present
|
||||
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 32e273f..050e754 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -882,7 +882,7 @@ AC_ARG_WITH([libxfs],
|
||||
[AS_HELP_STRING([--without-libxfs], [disable libxfs use by FileStore])],
|
||||
[],
|
||||
[with_libxfs=yes])
|
||||
-AS_IF([test "x$with_libxfs" != "xno"], [
|
||||
+AS_IF([test "x$with_libxfs" = "hack..."], [
|
||||
# xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
|
||||
AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
|
||||
[xfs/xfs.h not found (--without-libxfs to disable)]))
|
||||
@@ -900,6 +900,7 @@ AS_IF([test "x$with_libxfs" != "xno"], [
|
||||
AC_MSG_ERROR([XFS_XFLAG_EXTSIZE not found (--without-libxfs to disable)])
|
||||
])
|
||||
])
|
||||
+AC_DEFINE([HAVE_LIBXFS], [1], [Define to 1 if you have libxfs])
|
||||
AM_CONDITIONAL(WITH_LIBXFS, [test "x$with_libxfs" != "xno"])
|
||||
|
||||
# use libzfs
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From b204da4e28a0238547c99ee1bf4080ae4d62ad33 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 8 Feb 2017 22:38:12 +0100
|
||||
Subject: [PATCH] librbd/Journal: include WorkQueue since we use it
|
||||
|
||||
Signed-off-by: Boris Ranto <branto@redhat.com>
|
||||
---
|
||||
src/librbd/Journal.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/librbd/Journal.h b/src/librbd/Journal.h
|
||||
index 4b70b99..2490975 100644
|
||||
--- a/src/librbd/Journal.h
|
||||
+++ b/src/librbd/Journal.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "common/Cond.h"
|
||||
#include "common/Mutex.h"
|
||||
#include "common/Cond.h"
|
||||
+#include "common/WorkQueue.h"
|
||||
#include "journal/Future.h"
|
||||
#include "journal/JournalMetadataListener.h"
|
||||
#include "journal/ReplayEntry.h"
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
diff -urp ceph-0.87/src/include/encoding.h ceph-0.87-pm/src/include/encoding.h
|
||||
--- ceph-0.87/src/include/encoding.h 2014-10-29 19:09:14.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/include/encoding.h 2015-01-29 02:47:10.392860344 +0100
|
||||
@@ -286,7 +286,7 @@ inline void decode(T &o, bufferlist& bl)
|
||||
#include <deque>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
|
||||
#ifndef _BACKWARD_BACKWARD_WARNING_H
|
||||
#define _BACKWARD_BACKWARD_WARNING_H // make gcc 4.3 shut up about hash_*
|
||||
diff -urp ceph-0.87/src/os/DBObjectMap.h ceph-0.87-pm/src/os/DBObjectMap.h
|
||||
--- ceph-0.87/src/os/DBObjectMap.h 2014-10-29 19:09:14.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/os/DBObjectMap.h 2015-01-29 02:46:59.915044699 +0100
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "common/Mutex.h"
|
||||
#include "common/Cond.h"
|
||||
#include "common/simple_cache.hpp"
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
|
||||
/**
|
||||
* DBObjectMap: Implements ObjectMap in terms of KeyValueDB
|
||||
diff -urp ceph-0.87/src/osd/ECBackend.cc ceph-0.87-pm/src/osd/ECBackend.cc
|
||||
--- ceph-0.87/src/osd/ECBackend.cc 2014-10-29 19:09:19.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/osd/ECBackend.cc 2015-01-29 02:56:47.662703397 +0100
|
||||
@@ -13,7 +13,7 @@
|
||||
*/
|
||||
|
||||
#include <boost/variant.hpp>
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const
|
||||
lhs << "read_result_t(r=" << rhs.r
|
||||
<< ", errors=" << rhs.errors;
|
||||
if (rhs.attrs) {
|
||||
- lhs << ", attrs=" << rhs.attrs;
|
||||
+ lhs << ", attrs=" << (bool)rhs.attrs;
|
||||
} else {
|
||||
lhs << ", noattrs";
|
||||
}
|
||||
diff -urp ceph-0.87/src/osd/ECBackend.h ceph-0.87-pm/src/osd/ECBackend.h
|
||||
--- ceph-0.87/src/osd/ECBackend.h 2014-10-29 19:09:14.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/osd/ECBackend.h 2015-01-29 02:47:01.716013012 +0100
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "OSD.h"
|
||||
#include "PGBackend.h"
|
||||
#include "osd_types.h"
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
#include "erasure-code/ErasureCodeInterface.h"
|
||||
#include "ECTransaction.h"
|
||||
#include "ECMsgTypes.h"
|
||||
diff -urp ceph-0.87/src/osd/ECTransaction.cc ceph-0.87-pm/src/osd/ECTransaction.cc
|
||||
--- ceph-0.87/src/osd/ECTransaction.cc 2014-10-29 19:09:19.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/osd/ECTransaction.cc 2015-01-29 02:47:00.229039175 +0100
|
||||
@@ -13,7 +13,7 @@
|
||||
*/
|
||||
|
||||
#include <boost/variant.hpp>
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <sstream>
|
||||
diff -urp ceph-0.87/src/osd/ECTransaction.h ceph-0.87-pm/src/osd/ECTransaction.h
|
||||
--- ceph-0.87/src/osd/ECTransaction.h 2014-10-29 19:09:14.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/osd/ECTransaction.h 2015-01-29 02:47:01.383018871 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "PGBackend.h"
|
||||
#include "osd_types.h"
|
||||
#include "ECUtil.h"
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
#include "erasure-code/ErasureCodeInterface.h"
|
||||
|
||||
class ECTransaction : public PGBackend::PGTransaction {
|
||||
diff -urp ceph-0.87/src/osd/osd_types.h ceph-0.87-pm/src/osd/osd_types.h
|
||||
--- ceph-0.87/src/osd/osd_types.h 2014-10-29 19:09:14.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/osd/osd_types.h 2015-01-29 02:47:01.400018572 +0100
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <stdio.h>
|
||||
#include <memory>
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
|
||||
#include "include/rados/rados_types.hpp"
|
||||
|
||||
diff -urp ceph-0.87/src/osd/ReplicatedPG.h ceph-0.87-pm/src/osd/ReplicatedPG.h
|
||||
--- ceph-0.87/src/osd/ReplicatedPG.h 2014-10-29 19:09:14.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/osd/ReplicatedPG.h 2015-01-29 02:47:05.062954123 +0100
|
||||
@@ -17,7 +17,7 @@
|
||||
#ifndef CEPH_REPLICATEDPG_H
|
||||
#define CEPH_REPLICATEDPG_H
|
||||
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
|
||||
#include "include/assert.h"
|
||||
diff -urp ceph-0.87/src/common/map_cacher.hpp ceph-0.87-pm/src/common/map_cacher.hpp
|
||||
--- ceph-0.87/src/common/map_cacher.hpp 2014-10-29 19:09:14.000000000 +0100
|
||||
+++ ceph-0.87-pm/src/common/map_cacher.hpp 2015-01-29 02:48:12.007776242 +0100
|
||||
@@ -16,7 +16,7 @@
|
||||
#define MAPCACHER_H
|
||||
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
-#include <boost/optional.hpp>
|
||||
+#include <boost/optional/optional_io.hpp>
|
||||
#include "include/memory.h"
|
||||
#include <set>
|
||||
#include <map>
|
||||
@@ -1,13 +0,0 @@
|
||||
--- 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"
|
||||
Reference in New Issue
Block a user