diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-02 09:41:38 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-03 01:28:16 -0500 |
| commit | 6f88049caf56022c773272e03ddfa8cf79867059 (patch) | |
| tree | fa437786f79a0470f3a7e74a441952baa8edfb8e /fs/minix | |
| parent | 37750cdda36721fa7fa816f5f58258d2c013b248 (diff) | |
| download | blackbird-op-linux-6f88049caf56022c773272e03ddfa8cf79867059.tar.gz blackbird-op-linux-6f88049caf56022c773272e03ddfa8cf79867059.zip | |
minix: i_nlink races in rename()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/namei.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index ce7337ddfdbf..6e6777f1b4b2 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -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) @@ -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); |
