From patchwork Sat Aug 6 09:37:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liubo X-Patchwork-Id: 1041282 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p769qqg2022469 for ; Sat, 6 Aug 2011 09:52:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755414Ab1HFJiy (ORCPT ); Sat, 6 Aug 2011 05:38:54 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:57766 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755170Ab1HFJiv (ORCPT ); Sat, 6 Aug 2011 05:38:51 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id DD7F8170126; Sat, 6 Aug 2011 17:38:44 +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 p769chMe005912; Sat, 6 Aug 2011 17:38:44 +0800 Received: from localhost.localdomain ([10.167.225.27]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011080617374353-63904 ; Sat, 6 Aug 2011 17:37:43 +0800 From: Liu Bo To: Cc: Subject: [PATCH 08/12 v5] Btrfs: add checksum check for log Date: Sat, 6 Aug 2011 17:37:43 +0800 Message-Id: <1312623467-31487-9-git-send-email-liubo2009@cn.fujitsu.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1312623467-31487-1-git-send-email-liubo2009@cn.fujitsu.com> References: <1312623467-31487-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-08-06 17:37:43, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-08-06 17:37:44, Serialize complete at 2011-08-06 17:37:44 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 (demeter2.kernel.org [140.211.167.43]); Sat, 06 Aug 2011 09:52:54 +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 5394055..15b6f71 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2687,11 +2687,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); @@ -2746,7 +2747,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);