Skip to content

Commit

Permalink
nilfs2: delete mark_inode_dirty in nilfs_delete_entry
Browse files Browse the repository at this point in the history
Delete mark_inode_dirty() in nilfs_delete_entry() to reduce duplicate
mark_inode_dirty() calls both in nilfs_rename() and nilfs_delete_entry().

Signed-off-by: Jiro SEKIBA <jir@unicus.jp>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
  • Loading branch information
Jiro SEKIBA authored and Ryusuke Konishi committed Nov 27, 2009
1 parent 58d5547 commit 3534573
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion fs/nilfs2/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page)
nilfs_commit_chunk(page, mapping, from, to);
inode->i_ctime = inode->i_mtime = CURRENT_TIME;
/* NILFS_I(inode)->i_flags &= ~NILFS_BTREE_FL; */
mark_inode_dirty(inode);
out:
nilfs_put_page(page);
return err;
Expand Down
3 changes: 2 additions & 1 deletion fs/nilfs2/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ static int nilfs_unlink(struct inode *dir, struct dentry *dentry)
err = nilfs_do_unlink(dir, dentry);

if (!err) {
mark_inode_dirty(dir);
mark_inode_dirty(dentry->d_inode);
err = nilfs_transaction_commit(dir->i_sb);
} else
Expand Down Expand Up @@ -450,8 +451,8 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (dir_de) {
nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
drop_nlink(old_dir);
mark_inode_dirty(old_dir);
}
mark_inode_dirty(old_dir);
mark_inode_dirty(old_inode);

err = nilfs_transaction_commit(old_dir->i_sb);
Expand Down

0 comments on commit 3534573

Please sign in to comment.