Fix 32-bit alignment

This commit is contained in:
Kaleb S. KEITHLEY 2017-08-10 15:53:25 -04:00
parent bba7f9c4e3
commit 5867ad7fc7
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,30 @@
diff --git a/src/tools/rbd_mirror/InstanceReplayer.cc b/src/tools/rbd_mirror/InstanceReplayer.cc
index 097007231b..52e60605c7 100644
--- a/src/tools/rbd_mirror/InstanceReplayer.cc
+++ b/src/tools/rbd_mirror/InstanceReplayer.cc
@@ -372,9 +372,9 @@
return;
}
- size_t image_count = 0;
- size_t warning_count = 0;
- size_t error_count = 0;
+ uint64_t image_count = 0;
+ uint64_t warning_count = 0;
+ uint64_t error_count = 0;
for (auto &it : m_image_replayers) {
++image_count;
auto health_state = it.second->get_health_state();
diff --git a/src/tools/rbd_mirror/PoolWatcher.h b/src/tools/rbd_mirror/PoolWatcher.h
index 51ee00e9ad..9a02bad4bd 100644
--- a/src/tools/rbd_mirror/PoolWatcher.h
+++ b/src/tools/rbd_mirror/PoolWatcher.h
@@ -52,7 +52,7 @@ public:
void init(Context *on_finish = nullptr);
void shut_down(Context *on_finish);
- inline size_t get_image_count() const {
+ inline uint64_t get_image_count() const {
Mutex::Locker locker(m_lock);
return m_image_ids.size();
}

View File

@ -70,7 +70,7 @@
#################################################################################
Name: ceph
Version: 12.1.2
Release: 1%{?dist}
Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
@ -89,6 +89,7 @@ Source0: http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
Patch001: 0001-src-rocksdb-util-murmurhash.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1474774
Patch002: 0002-cmake-Support-ppc64.patch
Patch003: 0003-src-tools-rbd_mirror.patch
%if 0%{?suse_version}
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
@ -1767,6 +1768,9 @@ exit 0
%changelog
* Thu Aug 10 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.2-2
- Fix 32-bit alignment
* Thu Aug 3 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.2-1
- New release (1:12.1.2-1)