summaryrefslogtreecommitdiff
path: root/fs/nilfs2
diff options
context:
space:
mode:
authorJiro SEKIBA <jir@unicus.jp>2009-11-27 19:41:13 +0900
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-11-27 20:05:16 +0900
commit3534573b58fd7576d3dc8dd66a9973592ac08b2d (patch)
tree336143c737901da8612baac5e0434d80ee4aade8 /fs/nilfs2
parent58d55471cb1911f7493aba7bf3b6b87ca91e4314 (diff)
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>
Diffstat (limited to 'fs/nilfs2')
-rw-r--r--fs/nilfs2/dir.c1
-rw-r--r--fs/nilfs2/namei.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index 693539b2c8a3..1d9a4e4d1286 100644
--- 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 d6aa8f4c804b..4237722b549c 100644
--- 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);