Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bfa0c90c28 | |||
| 512f758b63 | |||
| 40c0183c51 | |||
| edc2f5729d | |||
| b8c05a8d14 | |||
| fee6eea17b | |||
| fec89844e3 | |||
| b24854c0a7 |
@@ -0,0 +1,2 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
@@ -0,0 +1,27 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
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
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
outdated version, obsoleted by packages in CentOS Storage SIG
|
||||
Reference in New Issue
Block a user