From: Liu Bo <liubo2009@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <dave@jikos.cz>, <chris.mason@oracle.com>, <josef@redhat.com>
Subject: [PATCH 07/12] Btrfs: add checksum check for log
Date: Thu, 30 Jun 2011 15:36:27 +0800 [thread overview]
Message-ID: <1309419392-17770-8-git-send-email-liubo2009@cn.fujitsu.com> (raw)
In-Reply-To: <1309419392-17770-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 | 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);
--
1.6.5.2
next prev parent reply other threads:[~2011-06-30 7:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 7:36 [GIT PULL v4] Btrfs: improve write ahead log with sub transaction Liu Bo
2011-06-30 7:36 ` [PATCH 01/12] Btrfs: introduce sub transaction stuff Liu Bo
2011-06-30 7:36 ` [PATCH 02/12] Btrfs: update block generation if should_cow_block fails Liu Bo
2011-06-30 7:36 ` [PATCH 03/12] Btrfs: modify btrfs_drop_extents API Liu Bo
2011-06-30 7:36 ` [PATCH 04/12] Btrfs: introduce first sub trans Liu Bo
2011-06-30 7:36 ` [PATCH 05/12] Btrfs: still update inode trans stuff when size remains unchanged Liu Bo
2011-06-30 7:36 ` [PATCH 06/12] Btrfs: improve log with sub transaction Liu Bo
2011-06-30 7:36 ` Liu Bo [this message]
2011-06-30 7:36 ` [PATCH 08/12] Btrfs: fix a bug of log check Liu Bo
2011-06-30 7:36 ` [PATCH 09/12] Btrfs: kick off useless code Liu Bo
2011-06-30 7:36 ` [PATCH 10/12] Btrfs: use the right generation number to read log_root_tree Liu Bo
2011-06-30 7:36 ` [PATCH 11/12] Btrfs: do not iput inode when inode is still in log Liu Bo
2011-06-30 7:36 ` [PATCH 12/12] Revert "Btrfs: do not flush csum items of unchanged file data during treelog" Liu Bo
2011-06-30 9:27 ` [GIT PULL v4] Btrfs: improve write ahead log with sub transaction 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=1309419392-17770-8-git-send-email-liubo2009@cn.fujitsu.com \
--to=liubo2009@cn.fujitsu.com \
--cc=chris.mason@oracle.com \
--cc=dave@jikos.cz \
--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).