From patchwork Thu May 26 08:19:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liubo X-Patchwork-Id: 819962 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4Q8LmP8016448 for ; Thu, 26 May 2011 08:22:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756729Ab1EZIVt (ORCPT ); Thu, 26 May 2011 04:21:49 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:63785 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756416Ab1EZIVq (ORCPT ); Thu, 26 May 2011 04:21:46 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 3655317013E; Thu, 26 May 2011 16:21:37 +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 p4Q8LXc3011386; Thu, 26 May 2011 16:21:35 +0800 Received: from localhost.localdomain ([10.167.225.27]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011052616213306-401270 ; Thu, 26 May 2011 16:21:33 +0800 From: Liu Bo To: Cc: , , Liu Bo Subject: [PATCH 08/11 v2] Btrfs: fix a bug of log check Date: Thu, 26 May 2011 16:19:23 +0800 Message-Id: <1306397966-7834-9-git-send-email-liubo2009@cn.fujitsu.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1306397966-7834-1-git-send-email-liubo2009@cn.fujitsu.com> References: <1306397966-7834-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-05-26 16:21:33, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-05-26 16:21:38, Serialize complete at 2011-05-26 16:21:38 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]); Thu, 26 May 2011 08:22:01 +0000 (UTC) The current code uses struct root's last_log_commit to check if an inode has been logged, but the problem is that this root->last_log_commit is shared among files. Say we have N inodes to be logged, after the first inode, root-last_log_commit is updated and the N-1 remains will not be logged. As we've introduce sub transaction and filled inode's last_trans and logged_trans with sub_transid instead of transaction id, we can just compare last_trans with logged_trans to determine if the processing inode is logged. And the more important thing is these two values are inode-individual, so it will not interfere with others. Signed-off-by: Liu Bo --- fs/btrfs/btrfs_inode.h | 5 ----- fs/btrfs/ctree.h | 1 - fs/btrfs/disk-io.c | 2 -- fs/btrfs/inode.c | 2 -- fs/btrfs/transaction.h | 1 - fs/btrfs/tree-log.c | 16 +++------------- 6 files changed, 3 insertions(+), 24 deletions(-) diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index fb5617a..d3a570c 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -94,11 +94,6 @@ struct btrfs_inode { u64 last_trans; /* - * log transid when this inode was last modified - */ - u64 last_sub_trans; - - /* * transid that last logged this inode */ u64 logged_trans; diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 1ba3f91..73aa36b 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1114,7 +1114,6 @@ struct btrfs_root { atomic_t log_writers; atomic_t log_commit[2]; unsigned long log_transid; - unsigned long last_log_commit; unsigned long log_batch; pid_t log_start_pid; bool log_multiple_pids; diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index a51c13c..5271365 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1079,7 +1079,6 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, atomic_set(&root->log_writers, 0); root->log_batch = 0; root->log_transid = 0; - root->last_log_commit = 0; extent_io_tree_init(&root->dirty_log_pages, fs_info->btree_inode->i_mapping, GFP_NOFS); @@ -1216,7 +1215,6 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans, WARN_ON(root->log_root); root->log_root = log_root; root->log_transid = 0; - root->last_log_commit = 0; return 0; } diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1ba98fd..8db16fa 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6585,7 +6585,6 @@ again: spin_unlock(&BTRFS_I(inode)->sub_trans_lock); BTRFS_I(inode)->last_trans = root->fs_info->sub_generation; - BTRFS_I(inode)->last_sub_trans = BTRFS_I(inode)->root->log_transid; unlock_extent_cached(io_tree, page_start, page_end, &cached_state, GFP_NOFS); @@ -6780,7 +6779,6 @@ struct inode *btrfs_alloc_inode(struct super_block *sb) ei->sequence = 0; ei->first_sub_trans = 0; ei->last_trans = 0; - ei->last_sub_trans = 0; ei->logged_trans = 0; ei->delalloc_bytes = 0; ei->reserved_bytes = 0; diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index d531aea..e169553 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h @@ -99,7 +99,6 @@ static inline void btrfs_set_inode_last_trans(struct btrfs_trans_handle *trans, spin_unlock(&BTRFS_I(inode)->sub_trans_lock); BTRFS_I(inode)->last_trans = trans->transid; - BTRFS_I(inode)->last_sub_trans = BTRFS_I(inode)->root->log_transid; } int btrfs_end_transaction(struct btrfs_trans_handle *trans, diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index ba014ea..8bedfb8 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1967,7 +1967,6 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, int ret; struct btrfs_root *log = root->log_root; struct btrfs_root *log_root_tree = root->fs_info->log_root_tree; - unsigned long log_transid = 0; mutex_lock(&root->log_mutex); index1 = root->log_transid % 2; @@ -2002,8 +2001,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, goto out; } - log_transid = root->log_transid; - if (log_transid % 2 == 0) + if (root->log_transid % 2 == 0) mark = EXTENT_DIRTY; else mark = EXTENT_NEW; @@ -2108,11 +2106,6 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, write_ctree_super(trans, root->fs_info->tree_root, 1); ret = 0; - mutex_lock(&root->log_mutex); - if (root->last_log_commit < log_transid) - root->last_log_commit = log_transid; - mutex_unlock(&root->log_mutex); - out_wake_log_root: atomic_set(&log_root_tree->log_commit[index2], 0); smp_mb(); @@ -3045,14 +3038,11 @@ out: static int inode_in_log(struct btrfs_trans_handle *trans, struct inode *inode) { - struct btrfs_root *root = BTRFS_I(inode)->root; int ret = 0; - mutex_lock(&root->log_mutex); - if (BTRFS_I(inode)->logged_trans == trans->transid && - BTRFS_I(inode)->last_sub_trans <= root->last_log_commit) + if (BTRFS_I(inode)->logged_trans >= trans->transaction->transid && + BTRFS_I(inode)->last_trans <= BTRFS_I(inode)->logged_trans) ret = 1; - mutex_unlock(&root->log_mutex); return ret; }