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

Commit 43f8bc26 authored by Jiro SEKIBA's avatar Jiro SEKIBA Committed by Ryusuke Konishi
Browse files

nilfs2: delete mark_inode_dirty from nilfs_set_link 



Delete mark_inode_dirty() from nilfs_set_link() to reduce redundant
mark_inode_dirty() calls in caller of nilfs_set_link().

Signed-off-by: default avatarJiro SEKIBA <jir@unicus.jp>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 9ca941d4

fs/nilfs2/dir.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -459,7 +459,6 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de, 
	nilfs_put_page(page);

	nilfs_put_page(page);

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

/*	NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */

/*	NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */

	mark_inode_dirty(dir);

}

}





/*

/*

fs/nilfs2/namei.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -397,6 +397,7 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			goto out_dir;

			goto out_dir;

		inode_inc_link_count(old_inode);

		inode_inc_link_count(old_inode);

		nilfs_set_link(new_dir, new_de, new_page, old_inode);

		nilfs_set_link(new_dir, new_de, new_page, old_inode);

		mark_inode_dirty(new_dir);

		new_inode->i_ctime = CURRENT_TIME;

		new_inode->i_ctime = CURRENT_TIME;

		if (dir_de)

		if (dir_de)

			drop_nlink(new_inode);

			drop_nlink(new_inode);
@@ -425,12 +426,13 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	old_inode->i_ctime = CURRENT_TIME;

	old_inode->i_ctime = CURRENT_TIME;





	nilfs_delete_entry(old_de, old_page);

	nilfs_delete_entry(old_de, old_page);

	inode_dec_link_count(old_inode);

	drop_nlink(old_inode);





	if (dir_de) {

	if (dir_de) {

		nilfs_set_link(old_inode, dir_de, dir_page, new_dir);

		nilfs_set_link(old_inode, dir_de, dir_page, new_dir);

		inode_dec_link_count(old_dir);

		inode_dec_link_count(old_dir);

	}

	}

	mark_inode_dirty(old_inode);





	err = nilfs_transaction_commit(old_dir->i_sb);

	err = nilfs_transaction_commit(old_dir->i_sb);

	return err;

	return err;