diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-03 15:37:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-03 15:37:59 -0800 |
| commit | 8336026942fdf6a96a45057a2fe6d7f7946979d5 (patch) | |
| tree | b831d361f5865a86ec645dccd87d74922099ac22 /fs/nilfs2 | |
| parent | 4c7fd114c65830cb052b6f3d0ab5b11626e64d5d (diff) | |
| parent | 69102e9b4b61f56a26717659ec2e572a6b18458d (diff) | |
| download | linux-8336026942fdf6a96a45057a2fe6d7f7946979d5.tar.gz linux-8336026942fdf6a96a45057a2fe6d7f7946979d5.tar.bz2 linux-8336026942fdf6a96a45057a2fe6d7f7946979d5.zip | |
Merge branch 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
hfs: fix rename() over non-empty directory
udf: fix i_nlink limit
fix reiserfs mkdir() breakage
exofs: i_nlink races in rename()
nilfs2: i_nlink races in rename()
minix: i_nlink races in rename()
ufs: i_nlink races in rename()
sysv: i_nlink races in rename()
Diffstat (limited to 'fs/nilfs2')
| -rw-r--r-- | fs/nilfs2/namei.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index 98034271cd02..161791d26458 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c @@ -397,7 +397,6 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, &new_page); if (!new_de) goto out_dir; - inc_nlink(old_inode); nilfs_set_link(new_dir, new_de, new_page, old_inode); nilfs_mark_inode_dirty(new_dir); new_inode->i_ctime = CURRENT_TIME; @@ -411,13 +410,9 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, if (new_dir->i_nlink >= NILFS_LINK_MAX) goto out_dir; } - inc_nlink(old_inode); err = nilfs_add_link(new_dentry, old_inode); - if (err) { - drop_nlink(old_inode); - nilfs_mark_inode_dirty(old_inode); + if (err) goto out_dir; - } if (dir_de) { inc_nlink(new_dir); nilfs_mark_inode_dirty(new_dir); @@ -431,7 +426,6 @@ 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); - drop_nlink(old_inode); if (dir_de) { nilfs_set_link(old_inode, dir_de, dir_page, new_dir); |