Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 79ba39cd11 | |||
| f6bd21aaa2 | |||
| 07057e050a | |||
| 18879ad313 | |||
| 0e4cc7c1b7 | |||
| 8cb6eae323 |
+7
-2
@@ -1,2 +1,7 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
ceph-0.20.tar.gz
|
||||
/ceph-0.21.3.tar.gz
|
||||
/ceph-0.25.1.tar.gz
|
||||
/ceph-0.26.tar.gz
|
||||
/ceph-0.31.tar.gz
|
||||
/ceph-0.37.tar.gz
|
||||
/ceph-0.39.tar.gz
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 14 Jan 2015 07:46:56 +0100
|
||||
Subject: [PATCH 1/3] gperftools deprecated google/* includes
|
||||
|
||||
---
|
||||
src/perfglue/heap_profiler.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
|
||||
index 6b079b8..cdd5ccb 100644
|
||||
--- a/src/perfglue/heap_profiler.cc
|
||||
+++ b/src/perfglue/heap_profiler.cc
|
||||
@@ -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"
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 14 Jan 2015 07:47:47 +0100
|
||||
Subject: [PATCH 2/3] -Wno-format causes compiler options collision
|
||||
|
||||
---
|
||||
src/test/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
|
||||
index 69f9e84..9ede275 100644
|
||||
--- a/src/test/Makefile.am
|
||||
+++ b/src/test/Makefile.am
|
||||
@@ -646,7 +646,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
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Mon, 8 Dec 2014 08:36:37 +0100
|
||||
Subject: [PATCH 3/3] Backport pull request #2937 to firefly
|
||||
|
||||
---
|
||||
src/common/RWLock.h | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/common/RWLock.h b/src/common/RWLock.h
|
||||
index f901ac0..f4d1937 100644
|
||||
--- a/src/common/RWLock.h
|
||||
+++ b/src/common/RWLock.h
|
||||
@@ -36,7 +36,9 @@ public:
|
||||
}
|
||||
|
||||
virtual ~RWLock() {
|
||||
- pthread_rwlock_unlock(&L);
|
||||
+ // The following check is racy but we are about to destroy
|
||||
+ // the object and we assume that there are no other users.
|
||||
+ //assert(!is_locked()); -- hacky backport, no is_locked in firefly
|
||||
pthread_rwlock_destroy(&L);
|
||||
}
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
--- ceph-0.21.1/src/init-ceph.in.orig 2010-07-29 15:16:49.000000000 -0500
|
||||
+++ ceph-0.21.1/src/init-ceph.in 2010-08-26 14:58:25.328581937 -0500
|
||||
@@ -1,11 +1,11 @@
|
||||
#!/bin/sh
|
||||
# Start/stop ceph daemons
|
||||
-# chkconfig: 2345 60 80
|
||||
+# chkconfig: - 60 80
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: ceph
|
||||
-# Default-Start: 2 3 4 5
|
||||
-# Default-Stop: 0 1 6
|
||||
+# Default-Start:
|
||||
+# Default-Stop:
|
||||
# Required-Start: $remote_fs $named $network $time
|
||||
# Required-Stop: $remote_fs $named $network $time
|
||||
# Short-Description: Start Ceph distributed file system daemons at boot time
|
||||
@@ -0,0 +1,11 @@
|
||||
--- ./src/logrotate.conf.new 2012-01-11 18:23:10.597593501 -0500
|
||||
+++ ./src/logrotate.conf 2012-01-11 18:23:26.808390838 -0500
|
||||
@@ -4,7 +4,7 @@
|
||||
compress
|
||||
sharedscripts
|
||||
postrotate
|
||||
- invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
|
||||
+ service ceph reload >/dev/null 2>/dev/null || true
|
||||
endscript
|
||||
missingok
|
||||
}
|
||||
Reference in New Issue
Block a user