Commit cdb26496 authored Mar 04, 2011 by Al Viro Committed by Bob Copeland Mar 05, 2011

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



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>

parent 013e4f4a

fs/omfs/dir.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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;

Admin message