aboutsummaryrefslogtreecommitdiffstats
path: root/community/ceph/30-32bit_fix.patch.noauto
diff options
context:
space:
mode:
Diffstat (limited to 'community/ceph/30-32bit_fix.patch.noauto')
-rw-r--r--community/ceph/30-32bit_fix.patch.noauto69
1 files changed, 2 insertions, 67 deletions
diff --git a/community/ceph/30-32bit_fix.patch.noauto b/community/ceph/30-32bit_fix.patch.noauto
index ece67f1d55..aba21d6400 100644
--- a/community/ceph/30-32bit_fix.patch.noauto
+++ b/community/ceph/30-32bit_fix.patch.noauto
@@ -1,3 +1,5 @@
+32bit specific patches
+
diff -uNr ceph-15.2.4/src/client/Client.cc ceph-15.2.4-arm32_fix/src/client/Client.cc
--- ceph-15.2.4/src/client/Client.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-arm32_fix/src/client/Client.cc 2020-11-21 22:11:16.061796876 +1030
@@ -75,48 +77,6 @@ diff -uNr ceph-15.2.4/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.c
bufferlist out_bl;
encode(images, out_bl);
-diff -uNr ceph-15.2.4/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc ceph-15.2.4-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
---- ceph-15.2.4/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc 2020-11-21 22:11:16.066796893 +1030
-@@ -234,7 +234,7 @@
-
- json_spirit::mObject root_obj;
- root_obj["replay_state"] = replay_state;
-- root_obj["remote_snapshot_timestamp"] = remote_snap_info->timestamp.sec();
-+ root_obj["remote_snapshot_timestamp"] = (uint64_t) remote_snap_info->timestamp.sec();
-
- auto matching_remote_snap_id = util::compute_remote_snap_id(
- m_state_builder->local_image_ctx->image_lock,
-@@ -249,7 +249,7 @@
- // the local snapshot would just be the time the snapshot was
- // synced and not the consistency point in time.
- root_obj["local_snapshot_timestamp"] =
-- matching_remote_snap_it->second.timestamp.sec();
-+ (uint64_t) matching_remote_snap_it->second.timestamp.sec();
- }
-
- matching_remote_snap_it = m_state_builder->remote_image_ctx->snap_info.find(
-@@ -257,7 +257,7 @@
- if (m_remote_snap_id_end != CEPH_NOSNAP &&
- matching_remote_snap_it !=
- m_state_builder->remote_image_ctx->snap_info.end()) {
-- root_obj["syncing_snapshot_timestamp"] = remote_snap_info->timestamp.sec();
-+ root_obj["syncing_snapshot_timestamp"] = (uint64_t) remote_snap_info->timestamp.sec();
- root_obj["syncing_percent"] = static_cast<uint64_t>(
- 100 * m_local_mirror_snap_ns.last_copied_object_number /
- static_cast<float>(std::max<uint64_t>(1U, m_local_object_count)));
-diff -Nurp a/src/librbd/object_map/DiffRequest.cc b/src/librbd/object_map/DiffRequest.cc
---- a/src/librbd/object_map/DiffRequest.cc
-+++ b/src/librbd/object_map/DiffRequest.cc
-@@ -187,7 +187,7 @@
- m_object_map.resize(m_object_diff_state->size());
- }
-
-- uint64_t overlap = std::min(m_object_map.size(), prev_object_diff_state_size);
-+ uint64_t overlap = std::min((size_t)m_object_map.size(), prev_object_diff_state_size);
- auto it = m_object_map.begin();
- auto overlap_end_it = it + overlap;
- auto diff_it = m_object_diff_state->begin();
diff -Nurp a/src/client/Client.h b/src/client/Client.h
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -147,29 +107,4 @@ diff -Nurp a/src/client/Client.h b/src/client/Client.h
void collect_and_send_metrics();
void collect_and_send_global_metrics();
---- a/src/common/cmdparse.h
-+++ b/src/common/cmdparse.h
-@@ -14,10 +14,10 @@
-
- typedef boost::variant<std::string,
- bool,
-- int64_t,
-+ size_t,
- double,
- std::vector<std::string>,
-- std::vector<int64_t>,
-+ std::vector<size_t>,
- std::vector<double>> cmd_vartype;
- typedef std::map<std::string, cmd_vartype, std::less<>> cmdmap_t;
---- a/src/s3select/include/s3select_functions.h
-+++ b/src/s3select/include/s3select_functions.h
-@@ -585,7 +585,7 @@
- {
- boost::gregorian::date_period dp =
- boost::gregorian::date_period( val_dt1.timestamp()->date(), val_dt2.timestamp()->date());
-- result->set_value( dp.length().days() );
-+ result->set_value( (int64_t)dp.length().days() );
- }
- else if (strcmp(val_date_part.str(), "hours") == 0)
- {