mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

omfs: stop playing silly buggers with omfs_unlink() in ->rename()

Browse source 
Since omfs directories are hashes of inodes and name is part of
inode, we have to remove inode from old directory before we can
put it into new one / under new name.  So instead of
	bump i_nlink
	call omfs_unlink, which does
		omfs_delete_entry()
		decrement i_nlink and mark parent dirty in case of success
	decrement i_nlink if omfs_unlink failed and hadn't done it itself
let's just call omfs_delete_entry() and dirty the parent ourselves...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Bob Copeland <me@bobcopeland.com>
This commit is contained in:
Al Viro 2011-03-04 01:18:19 -05:00 committed by Bob Copeland
parent 013e4f4a28
commit cdb26496db
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/omfs/dir.c
View file

@ -412,12 +412,11 @@ static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry,
/* since omfs locates files by name, we need to unlink _before_
* adding the new link or we won't find the old one */
inode_inc_link_count(old_inode);
err = omfs_unlink(old_dir, old_dentry);
if (err) {
inode_dec_link_count(old_inode);
err = omfs_delete_entry(old_dentry);
if (err)
goto out;
}
mark_inode_dirty(old_dir);
err = omfs_add_link(new_dentry, old_inode);
if (err)
goto out;