From 4e48dd56a4c3a1fed204da5859b10dab4ec98d4a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 28 Oct 2013 16:39:09 -0700 Subject: [PATCH] osd/ReplicatedPG: use MIN for backfill_pos Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 6cd5e2801e9..738b43494d2 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -7993,7 +7993,7 @@ int ReplicatedPG::recover_backfill( pbi.trim_to(last_backfill_started); backfill_info.trim_to(last_backfill_started); - hobject_t backfill_pos = backfill_info.begin > pbi.begin ? pbi.begin : backfill_info.begin; + hobject_t backfill_pos = MIN(backfill_info.begin, pbi.begin); while (ops < max) { if (backfill_info.begin <= pbi.begin && !backfill_info.extends_to_end() && backfill_info.empty()) { @@ -8004,7 +8004,7 @@ int ReplicatedPG::recover_backfill( update_range(&backfill_info, handle); backfill_info.trim(); } - backfill_pos = backfill_info.begin > pbi.begin ? pbi.begin : backfill_info.begin; + backfill_pos = MIN(backfill_info.begin, pbi.begin); dout(20) << " my backfill " << backfill_info.begin << "-" << backfill_info.end << " " << backfill_info.objects << dendl; @@ -8097,7 +8097,7 @@ int ReplicatedPG::recover_backfill( } } } - backfill_pos = backfill_info.begin > pbi.begin ? pbi.begin : backfill_info.begin; + backfill_pos = MIN(backfill_info.begin, pbi.begin); for (set::iterator i = add_to_stat.begin(); i != add_to_stat.end(); -- 2.47.3