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 11/12] Btrfs: do not iput inode when inode is still in log
Date: Thu, 30 Jun 2011 15:36:31 +0800 [thread overview]
Message-ID: <1309419392-17770-12-git-send-email-liubo2009@cn.fujitsu.com> (raw)
In-Reply-To: <1309419392-17770-1-git-send-email-liubo2009@cn.fujitsu.com>
We maintain the inode's logged_trans to avoid reloging it, but if we iput
the inode and reread it, we'll get logged_trans to zero.
So when an inode is still in log tree, and transaction is not committed yet,
we do not iput the inode.
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
---
fs/btrfs/inode.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0007ae3..d4c910c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6828,8 +6828,15 @@ int btrfs_drop_inode(struct inode *inode)
{
struct btrfs_root *root = BTRFS_I(inode)->root;
- if (btrfs_root_refs(&root->root_item) == 0 &&
- !is_free_space_inode(root, inode))
+ /*
+ * If the inode has been in the log tree and the transaction is not
+ * committed yet, then we need to keep this inode in cache.
+ */
+ if (BTRFS_I(inode)->last_trans >= root->fs_info->generation &&
+ BTRFS_I(inode)->logged_trans >= BTRFS_I(inode)->last_trans)
+ return 0;
+ else if (btrfs_root_refs(&root->root_item) == 0 &&
+ !is_free_space_inode(root, inode))
return 1;
else
return generic_drop_inode(inode);
--
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 ` [PATCH 07/12] Btrfs: add checksum check for log Liu Bo
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 ` Liu Bo [this message]
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-12-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).