From abc4be48b7da9b9fc38ed4f9bf2ed3109e03019d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 13 Mar 2018 21:16:29 -0500 Subject: [PATCH] osd/PrimaryLogPG: MIN -> std::min Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index a805eedc792..d438fc0e0c4 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -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;