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

Commit 912dbc15 authored by Sage Weil's avatar Sage Weil Committed by Al Viro
Browse files

vfs: clean up vfs_rmdir 



Simplify the control flow with an out label.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b5afd2c4

fs/namei.c

+17 −14
Original line number Diff line number Diff line
@@ -2563,23 +2563,26 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry) 
		return -EPERM;



	mutex_lock(&dentry->d_inode->i_mutex);

	if (d_mountpoint(dentry))



	error = -EBUSY;

	else {

	if (d_mountpoint(dentry))

		goto out;



	error = security_inode_rmdir(dir, dentry);

		if (!error) {

	if (error)

		goto out;



	error = dir->i_op->rmdir(dir, dentry);

			if (!error) {

	if (error)

		goto out;



	dentry->d_inode->i_flags |= S_DEAD;

	dont_mount(dentry);

			}

		}

	}



out:

	mutex_unlock(&dentry->d_inode->i_mutex);

	if (!error) {

	if (!error)

		d_delete(dentry);

	}



	return error;

}