Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2e7d2df authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Linus Torvalds
Browse files

nilfs2: cleanup nilfs_clear_inode 



This will remove the following unnecessary locks and cleanup code in
nilfs_clear_inode():

- unnecessary protection using nilfs_transaction_begin() and
  nilfs_transaction_end().

- cleanup code of i_dirty list field which is never chained
  when this function is called.

- spinlock used when releasing i_bh field.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3358b4aa

fs/nilfs2/super.c

+1 −10
Original line number Diff line number Diff line
@@ -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);

}



/**