Skip to content

Commit

Permalink
minix: i_nlink races in rename()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Mar 3, 2011
1 parent 37750cd commit 6f88049
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions fs/minix/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
new_de = minix_find_entry(new_dentry, &new_page);
if (!new_de)
goto out_dir;
inode_inc_link_count(old_inode);
minix_set_link(new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
Expand All @@ -225,18 +224,15 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
if (new_dir->i_nlink >= info->s_link_max)
goto out_dir;
}
inode_inc_link_count(old_inode);
err = minix_add_link(new_dentry, old_inode);
if (err) {
inode_dec_link_count(old_inode);
if (err)
goto out_dir;
}
if (dir_de)
inode_inc_link_count(new_dir);
}

minix_delete_entry(old_de, old_page);
inode_dec_link_count(old_inode);
mark_inode_dirty(old_inode);

if (dir_de) {
minix_set_link(dir_de, dir_page, new_dir);
Expand Down

0 comments on commit 6f88049

Please sign in to comment.