]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: MIN -> std::min
authorSage Weil <sage@redhat.com>
Wed, 14 Mar 2018 02:16:29 +0000 (21:16 -0500)
committerSage Weil <sage@redhat.com>
Wed, 14 Mar 2018 02:16:29 +0000 (21:16 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PrimaryLogPG.cc

index a805eedc7925f3e760ccdc7c3977c28e91ab0e75..d438fc0e0c4247e326a72bcd39fdf7c91a49a46b 100644 (file)
@@ -1540,8 +1540,8 @@ void PrimaryLogPG::calc_trim_to()
   if (limit != eversion_t() &&
       limit != pg_trim_to &&
       pg_log.get_log().approx_size() > target) {
-    size_t num_to_trim = MIN(pg_log.get_log().approx_size() - target,
-                            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);
     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;