bit-ftbfs

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

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 0074c7964bf62ad3752a7a4baea5340f1e5b54be..610b2596fa29918a0e56b37d351c03fb88da4138 100644 (file)
--- 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) {