| 1 |
commit: 4af9cbde3856cdc92a13441e6cceb1f06c067d78 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Fri Mar 29 02:22:17 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 29 02:22:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af9cbde |
| 7 |
|
| 8 |
sys-cluster/ceph: Fix 12.2.11 compile fail on x86 (bug #679414) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/679414 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-cluster/ceph/ceph-12.2.11.ebuild | 1 + |
| 16 |
sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch | 13 +++++++++++++ |
| 17 |
2 files changed, 14 insertions(+) |
| 18 |
|
| 19 |
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 20 |
index d828bc7be4f..761d8f53495 100644 |
| 21 |
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 22 |
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 23 |
@@ -134,6 +134,7 @@ PATCHES=( |
| 24 |
"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" |
| 25 |
"${FILESDIR}/ceph-12.2.5-no-werror.patch" |
| 26 |
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
| 27 |
+ "${FILESDIR}/ceph-12.2.11-fix-min-call.patch" |
| 28 |
) |
| 29 |
|
| 30 |
check-reqs_export_vars() { |
| 31 |
|
| 32 |
diff --git a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..cd9eb4891cb |
| 35 |
--- /dev/null |
| 36 |
+++ b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch |
| 37 |
@@ -0,0 +1,13 @@ |
| 38 |
+diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc |
| 39 |
+index 0074c7964b..98991be7d2 100644 |
| 40 |
+--- a/src/osd/PrimaryLogPG.cc |
| 41 |
++++ b/src/osd/PrimaryLogPG.cc |
| 42 |
+@@ -1582,7 +1582,7 @@ void PrimaryLogPG::calc_trim_to() |
| 43 |
+ if (limit != eversion_t() && |
| 44 |
+ limit != pg_trim_to && |
| 45 |
+ pg_log.get_log().approx_size() > target) { |
| 46 |
+- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target, |
| 47 |
++ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() - target), |
| 48 |
+ cct->_conf->osd_pg_log_trim_max); |
| 49 |
+ if (num_to_trim < cct->_conf->osd_pg_log_trim_min && |
| 50 |
+ cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) { |
Archives