From: Liu Bo <liubo2009@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <chris.mason@oracle.com>, <josef@redhat.com>,
Liu Bo <liubo2009@cn.fujitsu.com>
Subject: [PATCH 07/11 v2] Btrfs: add checksum check for log
Date: Thu, 26 May 2011 16:19:22 +0800 [thread overview]
Message-ID: <1306397966-7834-8-git-send-email-liubo2009@cn.fujitsu.com> (raw)
In-Reply-To: <1306397966-7834-1-git-send-email-liubo2009@cn.fujitsu.com>
If a inode is a BTRFS_INODE_NODATASUM one, it need not to look for csum items
any more.
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
---
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 28c3190..ba014ea 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2655,7 +2655,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;
@@ -2722,7 +2723,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);
@@ -2836,6 +2838,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
int ins_start_slot = 0;
int ins_nr;
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
@@ -2906,7 +2909,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;
@@ -2925,7 +2928,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;
@@ -2946,7 +2949,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;
--
1.6.5.2
next prev parent reply other threads:[~2011-05-26 8:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-26 8:19 [PATCH 00/11 v2] Btrfs: improve write ahead log with sub transaction Liu Bo
2011-05-26 8:19 ` [PATCH 01/11 v2] Btrfs: introduce sub transaction stuff Liu Bo
2011-05-26 8:19 ` [PATCH 02/11 v2] Btrfs: update block generation if should_cow_block fails Liu Bo
2011-05-26 8:19 ` [PATCH 03/11 v2] Btrfs: modify btrfs_drop_extents API Liu Bo
2011-05-26 8:19 ` [PATCH 04/11 v2] Btrfs: introduce first sub trans Liu Bo
2011-05-26 8:19 ` [PATCH 05/11 v2] Btrfs: still update inode trans stuff when size remains unchanged Liu Bo
2011-05-26 8:19 ` [PATCH 06/11 v2] Btrfs: improve log with sub transaction Liu Bo
2011-05-26 8:19 ` Liu Bo [this message]
2011-05-26 8:19 ` [PATCH 08/11 v2] Btrfs: fix a bug of log check Liu Bo
2011-05-26 8:19 ` [PATCH 09/11 v2] Btrfs: kick off useless code Liu Bo
2011-05-26 8:19 ` [PATCH 10/11 v2] Btrfs: deal with EEXIST after iput Liu Bo
2011-05-26 8:19 ` [PATCH 11/11 v2] Btrfs: use the right generation number to read log_root_tree Liu Bo
2011-05-26 8:30 ` [PATCH 00/11 v2] Btrfs: improve write ahead log with sub transaction liubo
2011-06-10 0:40 ` David Sterba
2011-06-10 0:52 ` liubo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306397966-7834-8-git-send-email-liubo2009@cn.fujitsu.com \
--to=liubo2009@cn.fujitsu.com \
--cc=chris.mason@oracle.com \
--cc=josef@redhat.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).