From patchwork Thu Mar 25 12:30: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: 88210 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 o2PCU7sT029527 for ; Thu, 25 Mar 2010 12:30:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752174Ab0CYMaF (ORCPT ); Thu, 25 Mar 2010 08:30:05 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:58929 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751106Ab0CYMaC (ORCPT ); Thu, 25 Mar 2010 08:30: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 55F93170080; Thu, 25 Mar 2010 20:30: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 o2PCSg7q005931; Thu, 25 Mar 2010 20:28:42 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 7C9F7DC224; Thu, 25 Mar 2010 20:32:27 +0800 (CST) Message-ID: <4BAB5759.7010903@cn.fujitsu.com> Date: Thu, 25 Mar 2010 20:30: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 05/18] btrfs: Take num_copies out of loop for btree_read_extent_buffer_pages() 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:30:08 +0000 (UTC) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 11d0ad3..79d9196 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -301,7 +301,8 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root, { struct extent_io_tree *io_tree; int ret; - int num_copies = 0; + int num_copies = btrfs_num_copies(&root->fs_info->mapping_tree, + eb->start, eb->len); int mirror_num = 0; io_tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree; @@ -312,8 +313,6 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root, !verify_parent_transid(io_tree, eb, parent_transid)) return ret; - num_copies = btrfs_num_copies(&root->fs_info->mapping_tree, - eb->start, eb->len); if (num_copies == 1) return ret;