- requires gcc 11+ now

[packages/ceph.git] / types.patch

diff --git a/types.patch b/types.patch
index 3df886a39eb31c548cc0db0d1a0703d698df85e1..85fabe60c2a960ee2c3d9c105e3f013d6867ea37 100644 (file)
--- a/types.patch
+++ b/types.patch
@@ -1,21 +1,3 @@
---- ceph-16.2.7/src/log/LogClock.h~    2021-12-07 17:15:49.000000000 +0100
-+++ ceph-16.2.7/src/log/LogClock.h     2022-02-12 18:57:04.434978131 +0100
-@@ -8,14 +8,11 @@
- #include <chrono>
- #include <ctime>
- #include <sys/time.h>
-+#include <sys/types.h>
- 
- #include "include/ceph_assert.h"
- #include "common/ceph_time.h"
- 
--#ifndef suseconds_t
--typedef long suseconds_t;
--#endif
--
- namespace ceph {
- namespace logging {
- namespace _logclock {

 --- 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 @@
 --- 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 @@


@@ -27,20 +9,9 @@
  {
    d(5) << size << dendl;
  
  {
    d(5) << size << dendl;
  

---- ceph-16.2.7/src/common/buffer.cc~  2021-12-07 17:15:49.000000000 +0100
-+++ ceph-16.2.7/src/common/buffer.cc   2022-02-12 19:45:24.576619502 +0100
-@@ -2272,7 +2272,7 @@
- 
- void ceph::buffer::list::page_aligned_appender::_refill(size_t len) {
-   const size_t alloc = \
--    std::max((size_t)min_alloc, (len + CEPH_PAGE_SIZE - 1) & CEPH_PAGE_MASK);
-+    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 @@
+--- ceph-17.2.7/src/os/bluestore/BlueFS.cc.orig        2024-02-24 21:45:42.755706899 +0100
++++ ceph-17.2.7/src/os/bluestore/BlueFS.cc     2024-02-24 21:51:20.641018002 +0100
+@@ -4617,7 +4617,7 @@ size_t BlueFS::probe_alloc_avail(int dev

      if (dist_to_alignment >= len)
        return;
      len -= dist_to_alignment;
      if (dist_to_alignment >= len)
        return;
      len -= dist_to_alignment;


@@ -48,29 +19,7 @@
 +    total += p2align((uint64_t)len, alloc_size);
    };
    if (alloc[dev]) {
 +    total += p2align((uint64_t)len, alloc_size);
    };
    if (alloc[dev]) {

-     alloc[dev]->dump(iterated_allocation);
---- ceph-16.2.7/src/s3select/include/s3select_functions.h~     2020-06-23 03:08:18.000000000 +0200
-+++ ceph-16.2.7/src/s3select/include/s3select_functions.h      2022-02-12 22:04:21.710093616 +0100
-@@ -585,7 +585,7 @@
-     {
-       boost::gregorian::date_period dp =
-         boost::gregorian::date_period( val_dt1.timestamp()->date(), val_dt2.timestamp()->date());
--      result->set_value( dp.length().days() );
-+      result->set_value( (int64_t)dp.length().days() );
-     }
-     else if (strcmp(val_date_part.str(), "hours") == 0)
-     {
---- ceph-16.2.7/src/librbd/object_map/DiffRequest.cc.orig      2021-12-07 17:15:49.000000000 +0100
-+++ ceph-16.2.7/src/librbd/object_map/DiffRequest.cc   2022-02-12 22:17:55.163378523 +0100
-@@ -187,7 +187,7 @@
-     m_object_map.resize(m_object_diff_state->size());
-   }
- 
--  uint64_t overlap = std::min(m_object_map.size(), prev_object_diff_state_size);
-+  uint64_t overlap = std::min(m_object_map.size(), (uint64_t)prev_object_diff_state_size);
-   auto it = m_object_map.begin();
-   auto overlap_end_it = it + overlap;
-   auto diff_it = m_object_diff_state->begin();
+     alloc[dev]->foreach(iterated_allocation);

 --- ceph-16.2.7/src/tools/neorados.cc~ 2021-12-07 17:15:49.000000000 +0100
 +++ ceph-16.2.7/src/tools/neorados.cc  2022-02-12 22:23:25.836643956 +0100
 @@ -205,7 +205,7 @@
 --- ceph-16.2.7/src/tools/neorados.cc~ 2021-12-07 17:15:49.000000000 +0100
 +++ ceph-16.2.7/src/tools/neorados.cc  2022-02-12 22:23:25.836643956 +0100
 @@ -205,7 +205,7 @@


@@ -102,3 +51,64 @@
        for (auto &[peer, peer_replayer] : m_peer_replayers) {
          dout(10) << ": peer=" << peer << dendl;
          peer_replayer->remove_directory(dir_path);
        for (auto &[peer, peer_replayer] : m_peer_replayers) {
          dout(10) << ": peer=" << peer << dendl;
          peer_replayer->remove_directory(dir_path);

+--- ceph-17.2.3/src/seastar/src/core/file.cc.orig      2021-12-19 23:02:10.000000000 +0100
++++ ceph-17.2.3/src/seastar/src/core/file.cc   2022-08-28 09:19:17.258501014 +0200
+@@ -313,7 +313,7 @@ posix_file_impl::close() noexcept {
+ 
+ future<uint64_t>
+ blockdev_file_impl::size(void) noexcept {
+-    return engine()._thread_pool->submit<syscall_result_extra<size_t>>([this] {
++    return engine()._thread_pool->submit<syscall_result_extra<uint64_t>>([this] {
+         uint64_t size;
+         int ret = ::ioctl(_fd, BLKGETSIZE64, &size);
+         return wrap_syscall(ret, size);
+@@ -908,7 +908,7 @@ append_challenged_posix_file_impl::trunc
+ 
+ future<uint64_t>
+ append_challenged_posix_file_impl::size() noexcept {
+-    return make_ready_future<size_t>(_logical_size);
++    return make_ready_future<uint64_t>(_logical_size);
+ }
+ 
+ future<>
+--- ceph-17.2.3/src/seastar/src/core/fstream.cc.orig   2021-12-19 23:02:10.000000000 +0100
++++ ceph-17.2.3/src/seastar/src/core/fstream.cc        2022-08-28 09:22:32.072057177 +0200
+@@ -419,7 +419,7 @@ private:
+         if ((buf.size() & (_file.disk_write_dma_alignment() - 1)) != 0) {
+             // If buf size isn't aligned, copy its content into a new aligned buf.
+             // This should only happen when the user calls output_stream::flush().
+-            auto tmp = allocate_buffer(align_up(buf.size(), _file.disk_write_dma_alignment()));
++            auto tmp = allocate_buffer(align_up<uint64_t>(buf.size(), _file.disk_write_dma_alignment()));
+             ::memcpy(tmp.get_write(), buf.get(), buf.size());
+             ::memset(tmp.get_write() + buf.size(), 0, tmp.size() - buf.size());
+             buf = std::move(tmp);
+--- ceph-18.2.3/src/osd/OSDMap.cc.orig 2024-04-24 21:57:21.000000000 +0200
++++ ceph-18.2.3/src/osd/OSDMap.cc      2024-06-01 18:51:51.915566430 +0200
+@@ -6170,14 +6170,14 @@ int OSDMap::calc_read_balance_score(Ceph
+     }
+     if (prim_pgs_by_osd.count(osd)) {
+       auto n_prims = prim_pgs_by_osd.at(osd).size();
+-      max_prims_per_osd = std::max(max_prims_per_osd, n_prims);
++      max_prims_per_osd = std::max<uint64_t>(max_prims_per_osd, n_prims);
+       if (osd_pa == 0.) {
+         prim_on_zero_pa = true;
+       }
+     }
+     if (acting_prims_by_osd.count(osd)) {
+       auto n_aprims = acting_prims_by_osd.at(osd).size();
+-      max_acting_prims_per_osd = std::max(max_acting_prims_per_osd, n_aprims);
++      max_acting_prims_per_osd = std::max<uint64_t>(max_acting_prims_per_osd, n_aprims);
+       if (osd_pa != 0.) {
+         max_osd_score = std::max(max_osd_score, float(n_aprims) / osd_pa);
+       }
+--- ceph-18.2.3/src/cls/rgw/cls_rgw_types.h.orig       2024-04-24 21:57:21.000000000 +0200
++++ ceph-18.2.3/src/cls/rgw/cls_rgw_types.h    2024-06-01 20:43:58.381041708 +0200
+@@ -1226,7 +1226,7 @@ struct cls_rgw_lc_obj_head
+     uint64_t t = start_date;
+     encode(t, bl);
+     encode(marker, bl);
+-    encode(shard_rollover_date, bl);
++    encode(static_cast<uint64_t>(shard_rollover_date), bl);
+     ENCODE_FINISH(bl);
+   }
+