- fix patch syntax

diff --git a/long-int-time_t.patch b/long-int-time_t.patch
index 7fba0d2331ed25ccd3673d5de2cc868e99419346..837ff108a51ddf4e7bcc2f1fb9e14cf226b0cb91 100644 (file)
--- a/long-int-time_t.patch
+++ b/long-int-time_t.patch
@@ -1,5 +1,5 @@
---- /home/users/baggins/devel/PLD/rpm/BUILD/ceph-16.2.7/src/json_spirit/json_spirit_value.h.orig       2021-12-07 17:15:49.000000000 +0100
-+++ /home/users/baggins/devel/PLD/rpm/BUILD/ceph-16.2.7/src/json_spirit/json_spirit_value.h    2022-02-13 10:26:48.023109513 +0100
+--- ceph-16.2.7/src/json_spirit/json_spirit_value.h.orig       2021-12-07 17:15:49.000000000 +0100
++++ ceph-16.2.7/src/json_spirit/json_spirit_value.h    2022-02-13 10:26:48.023109513 +0100
 @@ -51,6 +51,7 @@
          Value_impl( const Array&       value );\r
          Value_impl( bool               value );\r

diff --git a/types.patch b/types.patch
index 8f518c1f4f78df79151e3b6a3eb06fec05f61f7a..3df886a39eb31c548cc0db0d1a0703d698df85e1 100644 (file)
--- a/types.patch
+++ b/types.patch
@@ -16,7 +16,6 @@
  namespace ceph {
  namespace logging {
  namespace _logclock {
-   new_back->set_length(0);   // unused, so far.
 --- ceph-16.2.7/src/SimpleRADOSStriper.cc~     2021-12-07 17:15:49.000000000 +0100
 +++ ceph-16.2.7/src/SimpleRADOSStriper.cc      2022-02-12 21:59:28.261721940 +0100
 @@ -140,7 +140,7 @@
@@ -38,6 +37,7 @@
 +    std::max((size_t)min_alloc, (size_t)((len + CEPH_PAGE_SIZE - 1) & CEPH_PAGE_MASK));
    auto new_back = \
      ptr_node::create(buffer::create_page_aligned(alloc));
+   new_back->set_length(0);   // unused, so far.
 --- ceph-16.2.7/src/os/bluestore/BlueFS.cc~    2021-12-07 17:15:49.000000000 +0100
 +++ ceph-16.2.7/src/os/bluestore/BlueFS.cc     2022-02-12 21:40:54.182516511 +0100
 @@ -3799,7 +3799,7 @@