Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de22a4c3 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

vfs: rename: move d_move() up 



Move the d_move() in vfs_rename_dir() up, similarly to how it's done in
vfs_rename_other().  The next patch will consolidate these two functions
and this is the only structural difference between them.

I'm not sure if doing the d_move() after the dput is even valid.  But there
may be a logical explanation for that.  But moving the d_move() before the
dput() (and the mutex_unlock()) should definitely not hurt.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Reviewed-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 44b1d530

fs/namei.c

+2 −3
Original line number Diff line number Diff line
@@ -4045,13 +4045,12 @@ static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, 
		target->i_flags |= S_DEAD;

		dont_mount(new_dentry);

	}

	if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))

		d_move(old_dentry, new_dentry);

out:

	if (target)

		mutex_unlock(&target->i_mutex);

	dput(new_dentry);

	if (!error)

		if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))

			d_move(old_dentry,new_dentry);

	return error;

}