projects / packages / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| c8d4a223 JR |
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 | ||
| bbe36688 JR |
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 | |
| 14 | @@ -3799,7 +3799,7 @@ | |
| 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]->dump(iterated_allocation); | |
| bbe36688 JR |
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); |