From 8e101d4b8ebbe8c54702fdb64eaff83426adffc5 Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Mon, 6 Apr 2009 19:01:44 -0700 Subject: [PATCH] --- yaml --- r: 142625 b: refs/heads/master c: a2e7d2df82cafb76f76809ddf6e2caa8afe4f75e h: refs/heads/master i: 142623: ca9d1a5cd63b0dbf4cd1923a4d912fdba950020b v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/super.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f4ddfa6321ba..f1ae60fcc5dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3358b4aaa84fd4c1cdd64391875e92cbb8afeb29 +refs/heads/master: a2e7d2df82cafb76f76809ddf6e2caa8afe4f75e diff --git a/trunk/fs/nilfs2/super.c b/trunk/fs/nilfs2/super.c index 10e82c00aedc..268b563d215a 100644 --- a/trunk/fs/nilfs2/super.c +++ b/trunk/fs/nilfs2/super.c @@ -184,8 +184,6 @@ static inline void nilfs_destroy_inode_cache(void) static void nilfs_clear_inode(struct inode *inode) { struct nilfs_inode_info *ii = NILFS_I(inode); - struct nilfs_transaction_info ti; - struct nilfs_sb_info *sbi = NILFS_SB(inode->i_sb); #ifdef CONFIG_NILFS_POSIX_ACL if (ii->i_acl && ii->i_acl != NILFS_ACL_NOT_CACHED) { @@ -200,21 +198,14 @@ static void nilfs_clear_inode(struct inode *inode) /* * Free resources allocated in nilfs_read_inode(), here. */ - nilfs_transaction_begin(inode->i_sb, &ti, 0); - - spin_lock(&sbi->s_inode_lock); - if (!list_empty(&ii->i_dirty)) - list_del_init(&ii->i_dirty); + BUG_ON(!list_empty(&ii->i_dirty)); brelse(ii->i_bh); ii->i_bh = NULL; - spin_unlock(&sbi->s_inode_lock); if (test_bit(NILFS_I_BMAP, &ii->i_state)) nilfs_bmap_clear(ii->i_bmap); nilfs_btnode_cache_clear(&ii->i_btnode_cache); - - nilfs_transaction_end(inode->i_sb, 0); } /**