types.patch

   1 --- ceph-16.2.7/src/SimpleRADOSStriper.cc~      2021-12-07 17:15:49.000000000 +0100
   2 +++ ceph-16.2.7/src/SimpleRADOSStriper.cc       2022-02-12 21:59:28.261721940 +0100
   3 @@ -140,7 +140,7 @@
   4    return 0;
   5  }
   6
   7 -int SimpleRADOSStriper::truncate(uint64_t size)
   8 +int SimpleRADOSStriper::truncate(size_t size)
   9  {
  10    d(5) << size << dendl;
  11
  12 --- ceph-17.2.7/src/os/bluestore/BlueFS.cc.orig 2024-02-24 21:45:42.755706899 +0100
  13 +++ ceph-17.2.7/src/os/bluestore/BlueFS.cc      2024-02-24 21:51:20.641018002 +0100
  14 @@ -4617,7 +4617,7 @@ size_t BlueFS::probe_alloc_avail(int dev
  15      if (dist_to_alignment >= len)
  16        return;
  17      len -= dist_to_alignment;
  18 -    total += p2align(len, alloc_size);
  19 +    total += p2align((uint64_t)len, alloc_size);
  20    };
  21    if (alloc[dev]) {
  22      alloc[dev]->foreach(iterated_allocation);
  23 --- ceph-16.2.7/src/librbd/object_map/DiffRequest.cc.orig       2021-12-07 17:15:49.000000000 +0100
  24 +++ ceph-16.2.7/src/librbd/object_map/DiffRequest.cc    2022-02-12 22:17:55.163378523 +0100
  25 @@ -187,7 +187,7 @@
  26      m_object_map.resize(m_object_diff_state->size());
  27    }
  28
  29 -  uint64_t overlap = std::min(m_object_map.size(), prev_object_diff_state_size);
  30 +  uint64_t overlap = std::min(m_object_map.size(), (uint64_t)prev_object_diff_state_size);
  31    auto it = m_object_map.begin();
  32    auto overlap_end_it = it + overlap;
  33    auto diff_it = m_object_diff_state->begin();
  34 --- ceph-16.2.7/src/tools/neorados.cc~  2021-12-07 17:15:49.000000000 +0100
  35 +++ ceph-16.2.7/src/tools/neorados.cc   2022-02-12 22:23:25.836643956 +0100
  36 @@ -205,7 +205,7 @@
  37
  38    std::size_t off = 0;
  39    ceph::buffer::list bl;
  40 -  while (auto toread = std::max(len - off, io_size)) {
  41 +  while (auto toread = std::max(len - off, (uint64_t)io_size)) {
  42      R::ReadOp op;
  43      op.read(off, toread, &bl);
  44      r.execute(obj, pool, std::move(op), nullptr, y[ec]);
  45 --- ceph-16.2.7/src/tools/cephfs_mirror/FSMirror.cc.orig        2021-12-07 17:15:49.000000000 +0100
  46 +++ ceph-16.2.7/src/tools/cephfs_mirror/FSMirror.cc     2022-02-12 22:30:46.487298972 +0100
  47 @@ -345,7 +345,7 @@
  48      std::scoped_lock locker(m_lock);
  49      m_directories.emplace(dir_path);
  50      m_service_daemon->add_or_update_fs_attribute(m_filesystem.fscid, SERVICE_DAEMON_DIR_COUNT_KEY,
  51 -                                                 m_directories.size());
  52 +                                                 (uint64_t)m_directories.size());
  53
  54      for (auto &[peer, peer_replayer] : m_peer_replayers) {
  55        dout(10) << ": peer=" << peer << dendl;
  56 @@ -363,7 +363,7 @@
  57      if (it != m_directories.end()) {
  58        m_directories.erase(it);
  59        m_service_daemon->add_or_update_fs_attribute(m_filesystem.fscid, SERVICE_DAEMON_DIR_COUNT_KEY,
  60 -                                                   m_directories.size());
  61 +                                                   (uint64_t)m_directories.size());
  62        for (auto &[peer, peer_replayer] : m_peer_replayers) {
  63          dout(10) << ": peer=" << peer << dendl;
  64          peer_replayer->remove_directory(dir_path);
  65 --- ceph-17.2.2/src/os/bluestore/BlueStore.cc.orig      2022-07-21 19:29:33.000000000 +0200
  66 +++ ceph-17.2.2/src/os/bluestore/BlueStore.cc   2022-08-23 16:55:10.753944515 +0200
  67 @@ -18583,7 +18583,7 @@ int BlueStore::__restore_allocator(Alloc
  68    uint64_t        extent_count       = 0;
  69    uint64_t        extents_bytes_left = file_size - (header_size + trailer_size + sizeof(crc));
  70    while (extents_bytes_left) {
  71 -    int req_bytes  = std::min(extents_bytes_left, sizeof(buffer));
  72 +    uint64_t req_bytes  = std::min<uint64_t>(extents_bytes_left, sizeof(buffer));
  73      int read_bytes = bluefs->read(p_handle.get(), offset, req_bytes, nullptr, (char*)buffer);
  74      if (read_bytes != req_bytes) {
  75        derr << "Failed bluefs->read()::read_bytes=" << read_bytes << ", req_bytes=" << req_bytes << dendl;
  76 --- ceph-17.2.2/src/rgw/store/dbstore/sqlite/sqliteDB.cc.orig   2022-07-21 19:29:33.000000000 +0200
  77 +++ ceph-17.2.2/src/rgw/store/dbstore/sqlite/sqliteDB.cc        2022-08-24 06:15:01.162110603 +0200
  78 @@ -514,8 +514,10 @@ static int list_lc_head(const DoutPrefix
  79
  80    op.lc_head.index = (const char*)sqlite3_column_text(stmt, LCHeadIndex);
  81    op.lc_head.head.marker = (const char*)sqlite3_column_text(stmt, LCHeadMarker);
  82 -
  83 -  SQL_DECODE_BLOB_PARAM(dpp, stmt, LCHeadStartDate, op.lc_head.head.start_date, sdb);
  84 +
  85 +  { int64_t start_date;
  86 +  SQL_DECODE_BLOB_PARAM(dpp, stmt, LCHeadStartDate, start_date, sdb);
  87 +  op.lc_head.head.start_date = start_date; }
  88
  89    return 0;
  90  }
  91 @@ -2773,7 +2775,8 @@ int SQLInsertLCHead::Bind(const DoutPref
  92    SQL_BIND_TEXT(dpp, stmt, index, params->op.lc_head.head.marker.c_str(), sdb);
  93
  94    SQL_BIND_INDEX(dpp, stmt, index, p_params.op.lc_head.start_date.c_str(), sdb);
  95 -  SQL_ENCODE_BLOB_PARAM(dpp, stmt, index, params->op.lc_head.head.start_date, sdb);
  96 +  { int64_t start_date = params->op.lc_head.head.start_date;
  97 +  SQL_ENCODE_BLOB_PARAM(dpp, stmt, index, start_date, sdb); }
  98
  99  out:
 100    return rc;
 101 --- ceph-17.2.3/src/seastar/src/core/file.cc.orig       2021-12-19 23:02:10.000000000 +0100
 102 +++ ceph-17.2.3/src/seastar/src/core/file.cc    2022-08-28 09:19:17.258501014 +0200
 103 @@ -313,7 +313,7 @@ posix_file_impl::close() noexcept {
 104
 105  future<uint64_t>
 106  blockdev_file_impl::size(void) noexcept {
 107 -    return engine()._thread_pool->submit<syscall_result_extra<size_t>>([this] {
 108 +    return engine()._thread_pool->submit<syscall_result_extra<uint64_t>>([this] {
 109          uint64_t size;
 110          int ret = ::ioctl(_fd, BLKGETSIZE64, &size);
 111          return wrap_syscall(ret, size);
 112 @@ -908,7 +908,7 @@ append_challenged_posix_file_impl::trunc
 113
 114  future<uint64_t>
 115  append_challenged_posix_file_impl::size() noexcept {
 116 -    return make_ready_future<size_t>(_logical_size);
 117 +    return make_ready_future<uint64_t>(_logical_size);
 118  }
 119
 120  future<>
 121 @@ -996,7 +996,7 @@ make_file_impl(int fd, file_open_options
 122                  engine().fstatfs(fd).then([fd, st_dev] (struct statfs sfs) {
 123                      internal::fs_info fsi;
 124                      fsi.block_size = sfs.f_bsize;
 125 -                    switch (sfs.f_type) {
 126 +                    switch (static_cast<unsigned>(sfs.f_type)) {
 127                      case 0x58465342: /* XFS */
 128                          dioattr da;
 129                          if (::ioctl(fd, XFS_IOC_DIOINFO, &da) == 0) {
 130 --- ceph-17.2.3/src/seastar/src/core/fstream.cc.orig    2021-12-19 23:02:10.000000000 +0100
 131 +++ ceph-17.2.3/src/seastar/src/core/fstream.cc 2022-08-28 09:22:32.072057177 +0200
 132 @@ -419,7 +419,7 @@ private:
 133          if ((buf.size() & (_file.disk_write_dma_alignment() - 1)) != 0) {
 134              // If buf size isn't aligned, copy its content into a new aligned buf.
 135              // This should only happen when the user calls output_stream::flush().
 136 -            auto tmp = allocate_buffer(align_up(buf.size(), _file.disk_write_dma_alignment()));
 137 +            auto tmp = allocate_buffer(align_up<uint64_t>(buf.size(), _file.disk_write_dma_alignment()));
 138              ::memcpy(tmp.get_write(), buf.get(), buf.size());
 139              ::memset(tmp.get_write() + buf.size(), 0, tmp.size() - buf.size());
 140              buf = std::move(tmp);