[Pkg-ceph-commits] [ceph] 01/04: Remove patches firefly-latest and p2139 applied upstream

[Gaudenz Steinlin]

This is an automated email from the git hooks/post-receive script.

gaudenz pushed a commit to branch master
in repository ceph.

commit 71026125b53a498505dae2b8670ad24c5a7094a0
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Sat May 2 00:22:48 2015 +0200

    Remove patches firefly-latest and p2139 applied upstream
---
 debian/patches/firefly-latest.patch | 30 ----------------------------
 debian/patches/p2139.patch          | 39 -------------------------------------
 debian/patches/series               |  2 --
 3 files changed, 71 deletions(-)

diff --git a/debian/patches/firefly-latest.patch b/debian/patches/firefly-latest.patch
deleted file mode 100644
index b042b23..0000000
--- a/debian/patches/firefly-latest.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Last-Update: 2014-10-02
-Forwarded: not-needed
-Origin: upstream
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: fixes from "firefly" branch since 0.80.6 release
-
---- a/src/common/config.cc
-+++ b/src/common/config.cc
-@@ -946,9 +946,9 @@
-   return -ENOSYS;
- }
- 
- static const char *CONF_METAVARIABLES[] =
--  { "cluster", "type", "name", "host", "num", "id", "pid" };
-+  { "cluster", "type", "name", "host", "num", "id", "pid", "cctid" };
- static const int NUM_CONF_METAVARIABLES =
-       (sizeof(CONF_METAVARIABLES) / sizeof(CONF_METAVARIABLES[0]));
- 
- void md_config_t::expand_all_meta()
-@@ -1058,8 +1058,10 @@
- 	else if (var == "id")
- 	  out += name.get_id().c_str();
- 	else if (var == "pid")
- 	  out += stringify(getpid());
-+	else if (var == "cctid")
-+	  out += stringify((unsigned long long)this);
- 	else
- 	  assert(0); // unreachable
- 	expanded = true;
-       }
diff --git a/debian/patches/p2139.patch b/debian/patches/p2139.patch
deleted file mode 100644
index 6886c6a..0000000
--- a/debian/patches/p2139.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4eb18dd487da4cb621dcbecfc475fc0871b356ac Mon Sep 17 00:00:00 2001
-From: Ma Jianpeng <jianpeng.ma at intel.com>
-Date: Wed, 23 Jul 2014 10:10:38 -0700
-Subject: [PATCH] os/FileJournal: Update the journal header when closing
- journal
-
-When closing journal, it should check must_write_header and update
-journal header if must_write_header alreay set.
-It can reduce the nosense journal-replay after restarting osd.
-
-Signed-off-by: Ma Jianpeng <jianpeng.ma at intel.com>
-Reviewed-by: Sage Weil <sage at redhat.com>
----
- src/os/FileJournal.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/os/FileJournal.cc
-+++ b/src/os/FileJournal.cc
-@@ -543,8 +543,9 @@
-   stop_writer();
- 
-   // close
-   assert(writeq_empty());
-+  assert(!must_write_header);
-   assert(fd >= 0);
-   VOID_TEMP_FAILURE_RETRY(::close(fd));
-   fd = -1;
- }
-@@ -1101,9 +1102,9 @@
-   dout(10) << "write_thread_entry start" << dendl;
-   while (1) {
-     {
-       Mutex::Locker locker(writeq_lock);
--      if (writeq.empty()) {
-+      if (writeq.empty() && !must_write_header) {
- 	if (write_stop)
- 	  break;
- 	dout(20) << "write_thread_entry going to sleep" << dendl;
- 	writeq_cond.Wait(writeq_lock);
diff --git a/debian/patches/series b/debian/patches/series
index 8625fda..7a423c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,9 @@
 ## Backported / Upstream
-firefly-latest.patch
 bug-8342.patch
 bug-8624a.patch
 bug-8624b.patch
 bug-8821.patch
 bug-9341.patch
-p2139.patch
 client-sleep1.patch
 client-sleep2.patch
 client-sleep3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git