aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2
diff options
context:
space:
mode:
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)
595 nilfs_commit_chunk(page, mapping, from, to); 595 nilfs_commit_chunk(page, mapping, from, to);
596 inode->i_ctime = inode->i_mtime = CURRENT_TIME; 596 inode->i_ctime = inode->i_mtime = CURRENT_TIME;
597/* NILFS_I(inode)->i_flags &= ~NILFS_BTREE_FL; */ 597/* NILFS_I(inode)->i_flags &= ~NILFS_BTREE_FL; */
598 mark_inode_dirty(inode);
599out: 598out:
600 nilfs_put_page(page); 599 nilfs_put_page(page);
601 return err; 600 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)
334 err = nilfs_do_unlink(dir, dentry); 334 err = nilfs_do_unlink(dir, dentry);
335 335
336 if (!err) { 336 if (!err) {
337 mark_inode_dirty(dir);
337 mark_inode_dirty(dentry->d_inode); 338 mark_inode_dirty(dentry->d_inode);
338 err = nilfs_transaction_commit(dir->i_sb); 339 err = nilfs_transaction_commit(dir->i_sb);
339 } else 340 } else
@@ -450,8 +451,8 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
450 if (dir_de) { 451 if (dir_de) {
451 nilfs_set_link(old_inode, dir_de, dir_page, new_dir); 452 nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
452 drop_nlink(old_dir); 453 drop_nlink(old_dir);
453 mark_inode_dirty(old_dir);
454 } 454 }
455 mark_inode_dirty(old_dir);
455 mark_inode_dirty(old_inode); 456 mark_inode_dirty(old_inode);
456 457
457 err = nilfs_transaction_commit(old_dir->i_sb); 458 err = nilfs_transaction_commit(old_dir->i_sb);