From patchwork Tue Jun 21 08:49:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liubo X-Patchwork-Id: 900482 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 p5L8oXlR018295 for ; Tue, 21 Jun 2011 08:50:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752839Ab1FUIuU (ORCPT ); Tue, 21 Jun 2011 04:50:20 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:54115 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753225Ab1FUIuL (ORCPT ); Tue, 21 Jun 2011 04:50:11 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 2BD21170141; Tue, 21 Jun 2011 16:50:06 +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 p5L8o4GD019624; Tue, 21 Jun 2011 16:50:05 +0800 Received: from localhost.localdomain ([10.167.225.27]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011062116494133-627584 ; Tue, 21 Jun 2011 16:49:41 +0800 From: Liu Bo To: Cc: , , Subject: [PATCH 07/12 v3] Btrfs: add checksum check for log Date: Tue, 21 Jun 2011 16:49:48 +0800 Message-Id: <1308646193-7086-8-git-send-email-liubo2009@cn.fujitsu.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1308646193-7086-1-git-send-email-liubo2009@cn.fujitsu.com> References: <1308646193-7086-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-21 16:49:41, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-21 16:49:42, Serialize complete at 2011-06-21 16:49:42 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]); Tue, 21 Jun 2011 08:50: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 | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 6193e27..1eca1d4 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2672,7 +2672,8 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, struct inode *inode, struct btrfs_path *dst_path, struct extent_buffer *src, - int start_slot, int nr, int inode_only) + int start_slot, int nr, int inode_only, + int csum) { unsigned long src_offset; unsigned long dst_offset; @@ -2739,7 +2740,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); @@ -2857,6 +2859,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, int ins_nr; u64 ino = btrfs_ino(inode); u64 transid; + int csum = (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM) ? 0 : 1; /* * We use transid in btrfs_search_forward() as a filter, in order to @@ -2934,7 +2937,7 @@ filter: if (ins_nr) { ret = copy_items(trans, inode, dst_path, src, ins_start_slot, - ins_nr, inode_only); + ins_nr, inode_only, csum); if (ret) { err = ret; goto out_unlock; @@ -2953,7 +2956,7 @@ next_slot: if (ins_nr) { ret = copy_items(trans, inode, dst_path, src, ins_start_slot, - ins_nr, inode_only); + ins_nr, inode_only, csum); if (ret) { err = ret; goto out_unlock; @@ -2974,7 +2977,7 @@ next_slot: if (ins_nr) { ret = copy_items(trans, inode, dst_path, src, ins_start_slot, - ins_nr, inode_only); + ins_nr, inode_only, csum); if (ret) { err = ret; goto out_unlock;