From patchwork Thu Nov 12 09:36:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 59550 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAC9avRA020005 for ; Thu, 12 Nov 2009 09:36:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbZKLJgt (ORCPT ); Thu, 12 Nov 2009 04:36:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752686AbZKLJgt (ORCPT ); Thu, 12 Nov 2009 04:36:49 -0500 Received: from rcsinet11.oracle.com ([148.87.113.123]:19433 "EHLO rgminet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752652AbZKLJgs (ORCPT ); Thu, 12 Nov 2009 04:36:48 -0500 Received: from rgminet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rgminet11.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id nAC9apLx010682 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 12 Nov 2009 09:36:54 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by rgminet13.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id nAC7MM9M025795 for ; Thu, 12 Nov 2009 09:36:51 GMT Received: from abhmt005.oracle.com by acsmt354.oracle.com with ESMTP id 266921301258018606; Thu, 12 Nov 2009 01:36:46 -0800 Received: from [10.182.120.236] (/10.182.120.236) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 12 Nov 2009 01:36:46 -0800 Message-ID: <4AFBD72C.6010407@oracle.com> Date: Thu, 12 Nov 2009 17:36:44 +0800 From: "Yan, Zheng" User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20091014 Fedora/3.0-2.8.b4.fc11 Thunderbird/3.0b4 MIME-Version: 1.0 To: linux-btrfs@vger.kernel.org, chris Mason Subject: [PATCH 11/12] Btrfs: Fix btrfs_drop_extent_cache for skip pinned case X-Source-IP: acsmt356.oracle.com [141.146.40.156] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090203.4AFBD731.0061:SCFMA4539814,ss=1,fgs=0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index a4a6d2c..a78fb9b 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -179,18 +179,14 @@ int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end, } flags = em->flags; if (skip_pinned && test_bit(EXTENT_FLAG_PINNED, &em->flags)) { - if (em->start <= start && - (!testend || em->start + em->len >= start + len)) { + if (testend && em->start + em->len >= start + len) { free_extent_map(em); write_unlock(&em_tree->lock); break; } - if (start < em->start) { - len = em->start - start; - } else { + start = em->start + em->len; + if (testend) len = start + len - (em->start + em->len); - start = em->start + em->len; - } free_extent_map(em); write_unlock(&em_tree->lock); continue;