From f6b47e386d515c2348bcee532f41a86b154e69e1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 24 Sep 2010 13:57:00 -0700 Subject: [PATCH] osd: clean out redundant (and wrong) complete calculation Signed-off-by: Sage Weil --- src/osd/ReplicatedPG.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 264fed24a31..aba9a0c64ee 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3510,7 +3510,7 @@ void ReplicatedPG::sub_op_push(MOSDSubOp *op) dout(10) << "sub_op_push need " << data_needed << ", got " << data_subset << ", overlap " << overlap << dendl; - if (op->complete) { + if (complete) { // FIXME: we should verify that we got the whole thing. } @@ -3547,13 +3547,6 @@ void ReplicatedPG::sub_op_push(MOSDSubOp *op) // head|unversioned. for now, primary will _only_ pull full copies of the head. assert(op->clone_subsets.empty()); } - - if (pi->data_subset.empty()) { - complete = true; - } else { - complete = pi->data_subset.end() == data_subset.end(); - } - assert(complete == op->complete); } dout(15) << " data_subset " << data_subset << " clone_subsets " << clone_subsets