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