nilfs2: delete mark_inode_dirty in nilfs_delete_entry

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>

diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index 693539b2c8a39d9dbb4ff439ac902eae16bc0ba2..1d9a4e4d1286eda5320b3dcb47e897f512712bc5 100644 (file)
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
@@ -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;

diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c
index d6aa8f4c804b2e2c83de96e13c16527e7e46a1ed..4237722b549c7baa2154c19104e456cd621aeb5b 100644 (file)
--- a/fs/nilfs2/namei.c
+++ b/fs/nilfs2/namei.c
@@ -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
@@ -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);