From: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
Date: Tue, 19 Feb 2019 07:50:12 +0000 (+0000)
Subject: bit-ftbfs
X-Git-Tag: archive/raspbian/12.2.11+dfsg1-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9253af934f026c5eab70fef89f10e127c90532cd;p=ceph.git

bit-ftbfs


Gbp-Pq: Name 32-bit-ftbfs.patch
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 0074c7964..610b2596f 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1582,8 +1582,9 @@ void PrimaryLogPG::calc_trim_to()
   if (limit != eversion_t() &&
       limit != pg_trim_to &&
       pg_log.get_log().approx_size() > target) {
+    size_t osd_pg_log_trim_max = cct->_conf->osd_pg_log_trim_max;
     size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
-                             cct->_conf->osd_pg_log_trim_max);
+                                  osd_pg_log_trim_max);
     if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
         cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
       return;
@@ -1628,8 +1629,9 @@ void PrimaryLogPG::calc_trim_to_aggressive()
       pg_log.get_log().approx_size() > target) {
     dout(10) << __func__ << " approx pg log length =  "
              << pg_log.get_log().approx_size() << dendl;
+    size_t osd_pg_log_trim_max = cct->_conf->osd_pg_log_trim_max;
     size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
-				  cct->_conf->osd_pg_log_trim_max);
+				  osd_pg_log_trim_max);
     dout(10) << __func__ << " num_to_trim =  " << num_to_trim << dendl;
     if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
 	cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {