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
7 -int SimpleRADOSStriper::truncate(uint64_t size)
8 +int SimpleRADOSStriper::truncate(size_t size)
10 d(5) << size << dendl;
12 --- ceph-16.2.7/src/os/bluestore/BlueFS.cc~ 2021-12-07 17:15:49.000000000 +0100
13 +++ ceph-16.2.7/src/os/bluestore/BlueFS.cc 2022-02-12 21:40:54.182516511 +0100
15 if (dist_to_alignment >= len)
17 len -= dist_to_alignment;
18 - total += p2align(len, alloc_size);
19 + total += p2align((uint64_t)len, alloc_size);
22 alloc[dev]->dump(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
26 m_object_map.resize(m_object_diff_state->size());
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
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)) {
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
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());
54 for (auto &[peer, peer_replayer] : m_peer_replayers) {
55 dout(10) << ": peer=" << peer << dendl;
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
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);
83 - SQL_DECODE_BLOB_PARAM(dpp, stmt, LCHeadStartDate, op.lc_head.head.start_date, sdb);
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; }
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);
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); }