Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 174718
b: refs/heads/master
c: 43f8bc2
h: refs/heads/master
v: v3
  • Loading branch information
Jiro SEKIBA authored and Ryusuke Konishi committed Nov 27, 2009
1 parent 26ed8c0 commit 8f3ddf4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9ca941d4b62e72571948efe5a73c563b4cacc98d
refs/heads/master: 43f8bc262fcfadc7583b2353d2708e6eb77788ff
1 change: 0 additions & 1 deletion trunk/fs/nilfs2/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,6 @@ void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,
nilfs_put_page(page);
dir->i_mtime = dir->i_ctime = CURRENT_TIME;
/* NILFS_I(dir)->i_flags &= ~NILFS_BTREE_FL; */
mark_inode_dirty(dir);
}

/*
Expand Down
4 changes: 3 additions & 1 deletion trunk/fs/nilfs2/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
goto out_dir;
inode_inc_link_count(old_inode);
nilfs_set_link(new_dir, new_de, new_page, old_inode);
mark_inode_dirty(new_dir);
new_inode->i_ctime = CURRENT_TIME;
if (dir_de)
drop_nlink(new_inode);
Expand Down Expand Up @@ -425,12 +426,13 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry,
old_inode->i_ctime = CURRENT_TIME;

nilfs_delete_entry(old_de, old_page);
inode_dec_link_count(old_inode);
drop_nlink(old_inode);

if (dir_de) {
nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
inode_dec_link_count(old_dir);
}
mark_inode_dirty(old_inode);

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

0 comments on commit 8f3ddf4

Please sign in to comment.