From patchwork Thu Mar 25 12:38:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 88223 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2PCc6UI032526 for ; Thu, 25 Mar 2010 12:38:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752744Ab0CYMiF (ORCPT ); Thu, 25 Mar 2010 08:38:05 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:60173 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752017Ab0CYMiC (ORCPT ); Thu, 25 Mar 2010 08:38:02 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id CC2BB170091; Thu, 25 Mar 2010 20:38:01 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o2PCag8q006086; Thu, 25 Mar 2010 20:36:42 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id B9FCADC220; Thu, 25 Mar 2010 20:40:27 +0800 (CST) Message-ID: <4BAB5939.4060603@cn.fujitsu.com> Date: Thu, 25 Mar 2010 20:38:17 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 To: Chris Mason CC: Linux Btrfs Subject: [PATCH 18/18] btrfs: fix extent buffer pages release Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 25 Mar 2010 12:38:06 +0000 (UTC) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index dbbf9ca..a4391a6 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3099,6 +3099,31 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree, return eb; } +/* + * Used for releasing extent buffer page. + * + * can't release the first page of extent buffer at the beginning, because + * extent_buffer_page() gets address_space just by the first page->mapping, + * and then gets other pages. + */ +static void __release_extent_buffer_page(struct extent_buffer *eb) +{ + unsigned long index, num_pages; + struct page *page; + + num_pages = num_extent_pages(eb->start, eb->len); + for (index = 1; index < num_pages; index++) { + page = extent_buffer_page(eb, index); + if (page) + page_cache_release(page); + else + break; + } + page = extent_buffer_page(eb, 0); + if (page) + page_cache_release(page); +} + static void __free_extent_buffer(struct extent_buffer *eb) { #if LEAK_DEBUG @@ -3187,9 +3212,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree, free_eb: if (!atomic_dec_and_test(&eb->refs)) return exists; - for (index = 1; index < i; index++) - page_cache_release(extent_buffer_page(eb, index)); - page_cache_release(extent_buffer_page(eb, 0)); + __release_extent_buffer_page(eb); __free_extent_buffer(eb); return exists; } @@ -3863,9 +3886,7 @@ int try_release_extent_buffer(struct extent_io_tree *tree, struct page *page) goto out; } /* at this point we can safely release the extent buffer */ - num_pages = num_extent_pages(eb->start, eb->len); - for (i = 0; i < num_pages; i++) - page_cache_release(extent_buffer_page(eb, i)); + __release_extent_buffer_page(eb); rb_erase(&eb->rb_node, &tree->buffer); __free_extent_buffer(eb); out: