From patchwork Thu Mar 10 10:03:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henry Chang X-Patchwork-Id: 624001 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2AA3Yc1027365 for ; Thu, 10 Mar 2011 10:03:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346Ab1CJKDd (ORCPT ); Thu, 10 Mar 2011 05:03:33 -0500 Received: from mail-gw0-f46.google.com ([74.125.83.46]:51450 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751223Ab1CJKDd (ORCPT ); Thu, 10 Mar 2011 05:03:33 -0500 Received: by gwaa18 with SMTP id a18so349372gwa.19 for ; Thu, 10 Mar 2011 02:03:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to :content-type; bh=vnJD81Wi/m4OoTscWxZqHDKrDsRoTlSCoJrtd92Ff0A=; b=CLChgyXTD/+p3FAodgiTiUuQHt24NTnT/P3p5QgA9fBq42ZuIixddel0nFhEvOeuau rF0INaYGdgC/YoXY3dpS2xULGnC1YGGRNjbJwbcG+zS7355fCZ26Yae23rAi94hTydFl UNZsIBsCq30QG6P7s+MTaJ/GDoLriTm+7yKIU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=d5yf9P1TY25FKjMwTkat0t/ER7pvhhojTXs1grys2YUqMI8m7/+DNpXFYif3P1tY5I 9OsVSIkoF3VIpJnREpsI/Zy9ute1s8cHj0J3qcCj8bBSuauLKP8CW6zq7YnvaeKp1Qvs Kkz4p5Tx0RAh+KhivwhDIezKK6acqZJLDycXI= MIME-Version: 1.0 Received: by 10.101.41.13 with SMTP id t13mr884601anj.267.1299751412468; Thu, 10 Mar 2011 02:03:32 -0800 (PST) Received: by 10.101.118.4 with HTTP; Thu, 10 Mar 2011 02:03:32 -0800 (PST) Date: Thu, 10 Mar 2011 18:03:32 +0800 Message-ID: Subject: PG::Missing::rm From: Henry Chang To: ceph-devel@vger.kernel.org Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 10 Mar 2011 10:03:36 +0000 (UTC) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 4ce3336..29062c8 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3600,7 +3600,7 @@ void PG::Missing::add(const sobject_t& oid, eversion_t need, eversion_t have) void PG::Missing::rm(const sobject_t& oid, eversion_t when) { - if (missing.count(oid) && missing[oid].need < when) { + if (missing.count(oid) && missing[oid].need <= when) { rmissing.erase(missing[oid].need); missing.erase(oid);