diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-24 13:06:12 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-26 07:26:52 -0400 |
| commit | 9055cba711891a6313232629cd6bbca7c901e07f (patch) | |
| tree | 877880a16f0ec062c82ef36886ca5c2257ee9e89 /fs | |
| parent | 912dbc15d953791f013b0c64a8093ab0490e5f40 (diff) | |
| download | linux-3.10-9055cba711891a6313232629cd6bbca7c901e07f.tar.gz linux-3.10-9055cba711891a6313232629cd6bbca7c901e07f.tar.bz2 linux-3.10-9055cba711891a6313232629cd6bbca7c901e07f.zip | |
vfs: clean up vfs_rename_dir
Simplify control flow through vfs_rename_dir.
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/fs/namei.c b/fs/namei.c index 18c3293411f..ecb16d3727e 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2963,7 +2963,7 @@ static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry) { int error = 0; - struct inode *target; + struct inode *target = new_dentry->d_inode; /* * If we are going to change the parent - check write permissions, @@ -2979,20 +2979,24 @@ static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, if (error) return error; - target = new_dentry->d_inode; if (target) mutex_lock(&target->i_mutex); - if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry)) - error = -EBUSY; - else - error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry); + + error = -EBUSY; + if (d_mountpoint(old_dentry) || d_mountpoint(new_dentry)) + goto out; + + error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry); + if (error) + goto out; + if (target) { - if (!error) { - target->i_flags |= S_DEAD; - dont_mount(new_dentry); - } - mutex_unlock(&target->i_mutex); + target->i_flags |= S_DEAD; + dont_mount(new_dentry); } +out: + if (target) + mutex_unlock(&target->i_mutex); if (!error) if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE)) d_move(old_dentry,new_dentry); |