From patchwork Thu Jun 30 07:36:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liubo X-Patchwork-Id: 931812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5U7bYe4019987 for ; Thu, 30 Jun 2011 07:37:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758545Ab1F3Hhc (ORCPT ); Thu, 30 Jun 2011 03:37:32 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:50407 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1758500Ab1F3HhO (ORCPT ); Thu, 30 Jun 2011 03:37:14 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 5D120170152; Thu, 30 Jun 2011 15:37:04 +0800 (CST) Received: from mailserver.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 p5U7b2KC007375; Thu, 30 Jun 2011 15:37:03 +0800 Received: from localhost.localdomain ([10.167.225.27]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011063015363201-710389 ; Thu, 30 Jun 2011 15:36:32 +0800 From: Liu Bo To: Cc: , , Subject: [PATCH 07/12] Btrfs: add checksum check for log Date: Thu, 30 Jun 2011 15:36:27 +0800 Message-Id: <1309419392-17770-8-git-send-email-liubo2009@cn.fujitsu.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1309419392-17770-1-git-send-email-liubo2009@cn.fujitsu.com> References: <1309419392-17770-1-git-send-email-liubo2009@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-30 15:36:32, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-30 15:36:33, Serialize complete at 2011-06-30 15:36:33 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Jun 2011 07:37:35 +0000 (UTC) If a inode is a BTRFS_INODE_NODATASUM one, it need not to look for csum items any more. Signed-off-by: Liu Bo --- fs/btrfs/tree-log.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 0ccffb1..5b5c336 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2681,11 +2681,12 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, struct btrfs_file_extent_item *extent; struct btrfs_inode_item *inode_item; struct btrfs_key *ins_keys; - int ret; + struct list_head ordered_sums; u32 *ins_sizes; char *ins_data; + int ret; int i; - struct list_head ordered_sums; + int csum = (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM) ? 0 : 1; INIT_LIST_HEAD(&ordered_sums); @@ -2740,7 +2741,8 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, * or deletes of this inode don't have to relog the inode * again */ - if (btrfs_key_type(ins_keys + i) == BTRFS_EXTENT_DATA_KEY) { + if (btrfs_key_type(ins_keys + i) == + BTRFS_EXTENT_DATA_KEY && csum) { int found_type; extent = btrfs_item_ptr(src, start_slot + i, struct btrfs_file_extent_item);