x32.patch

   1 --- ceph-16.2.7/src/common/buffer.cc~   2021-12-07 17:15:49.000000000 +0100
   2 +++ ceph-16.2.7/src/common/buffer.cc    2022-02-12 19:45:24.576619502 +0100
   3 @@ -2272,7 +2272,7 @@
   4
   5  void ceph::buffer::list::page_aligned_appender::_refill(size_t len) {
   6    const size_t alloc = \
   7 -    std::max((size_t)min_alloc, (len + CEPH_PAGE_SIZE - 1) & CEPH_PAGE_MASK);
   8 +    std::max((size_t)min_alloc, (size_t)((len + CEPH_PAGE_SIZE - 1) & CEPH_PAGE_MASK));
   9    auto new_back = \
  10      ptr_node::create(buffer::create_page_aligned(alloc));
  11 --- ceph-16.2.7/src/os/bluestore/BlueFS.cc~     2021-12-07 17:15:49.000000000 +0100
  12 +++ ceph-16.2.7/src/os/bluestore/BlueFS.cc      2022-02-12 21:40:54.182516511 +0100
  13 @@ -3799,7 +3799,7 @@
  14      if (dist_to_alignment >= len)
  15        return;
  16      len -= dist_to_alignment;
  17 -    total += p2align(len, alloc_size);
  18 +    total += p2align((uint64_t)len, alloc_size);
  19    };
  20    if (alloc[dev]) {
  21      alloc[dev]->dump(iterated_allocation);
  22 --- ceph-16.2.7/src/s3select/include/s3select_functions.h~      2020-06-23 03:08:18.000000000 +0200
  23 +++ ceph-16.2.7/src/s3select/include/s3select_functions.h       2022-02-12 22:04:21.710093616 +0100
  24 @@ -585,7 +585,7 @@
  25      {
  26        boost::gregorian::date_period dp =
  27          boost::gregorian::date_period( val_dt1.timestamp()->date(), val_dt2.timestamp()->date());
  28 -      result->set_value( dp.length().days() );
  29 +      result->set_value( (int64_t)dp.length().days() );
  30      }
  31      else if (strcmp(val_date_part.str(), "hours") == 0)
  32      {
  33 --- ceph-16.2.7/src/librbd/object_map/DiffRequest.cc.orig       2021-12-07 17:15:49.000000000 +0100
  34 +++ ceph-16.2.7/src/librbd/object_map/DiffRequest.cc    2022-02-12 22:17:55.163378523 +0100
  35 @@ -187,7 +187,7 @@
  36      m_object_map.resize(m_object_diff_state->size());
  37    }
  38
  39 -  uint64_t overlap = std::min(m_object_map.size(), prev_object_diff_state_size);
  40 +  uint64_t overlap = std::min(m_object_map.size(), (uint64_t)prev_object_diff_state_size);
  41    auto it = m_object_map.begin();
  42    auto overlap_end_it = it + overlap;
  43    auto diff_it = m_object_diff_state->begin();
  44 --- ceph-16.2.7/src/tools/neorados.cc~  2021-12-07 17:15:49.000000000 +0100
  45 +++ ceph-16.2.7/src/tools/neorados.cc   2022-02-12 22:23:25.836643956 +0100
  46 @@ -205,7 +205,7 @@
  47
  48    std::size_t off = 0;
  49    ceph::buffer::list bl;
  50 -  while (auto toread = std::max(len - off, io_size)) {
  51 +  while (auto toread = std::max(len - off, (uint64_t)io_size)) {
  52      R::ReadOp op;
  53      op.read(off, toread, &bl);
  54      r.execute(obj, pool, std::move(op), nullptr, y[ec]);
  55 --- ceph-16.2.7/src/tools/cephfs_mirror/FSMirror.cc~    2021-12-07 17:15:49.000000000 +0100
  56 +++ ceph-16.2.7/src/tools/cephfs_mirror/FSMirror.cc     2022-02-12 22:28:42.717060249 +0100
  57 @@ -345,7 +345,7 @@
  58      std::scoped_lock locker(m_lock);
  59      m_directories.emplace(dir_path);
  60      m_service_daemon->add_or_update_fs_attribute(m_filesystem.fscid, SERVICE_DAEMON_DIR_COUNT_KEY,
  61 -                                                 m_directories.size());
  62 +                                                 (uint64_t)m_directories.size());
  63
  64      for (auto &[peer, peer_replayer] : m_peer_replayers) {
  65        dout(10) << ": peer=" << peer << dendl;
  66 --- ceph-16.2.7/src/tools/cephfs_mirror/FSMirror.cc.orig        2021-12-07 17:15:49.000000000 +0100
  67 +++ ceph-16.2.7/src/tools/cephfs_mirror/FSMirror.cc     2022-02-12 22:30:46.487298972 +0100
  68 @@ -345,7 +345,7 @@
  69      std::scoped_lock locker(m_lock);
  70      m_directories.emplace(dir_path);
  71      m_service_daemon->add_or_update_fs_attribute(m_filesystem.fscid, SERVICE_DAEMON_DIR_COUNT_KEY,
  72 -                                                 m_directories.size());
  73 +                                                 (uint64_t)m_directories.size());
  74
  75      for (auto &[peer, peer_replayer] : m_peer_replayers) {
  76        dout(10) << ": peer=" << peer << dendl;
  77 @@ -363,7 +363,7 @@
  78      if (it != m_directories.end()) {
  79        m_directories.erase(it);
  80        m_service_daemon->add_or_update_fs_attribute(m_filesystem.fscid, SERVICE_DAEMON_DIR_COUNT_KEY,
  81 -                                                   m_directories.size());
  82 +                                                   (uint64_t)m_directories.size());
  83        for (auto &[peer, peer_replayer] : m_peer_replayers) {
  84          dout(10) << ": peer=" << peer << dendl;
  85          peer_replayer->remove_directory(dir_path);