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

Commit 10fa8e62 authored by Al Viro's avatar Al Viro
Browse files

Unify exits in O_CREAT handling 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9e67f361

fs/namei.c

+13 −17
Original line number Diff line number Diff line
@@ -1821,9 +1821,8 @@ struct file *do_filp_open(int dfd, const char *pathname, 
		nd.flags |= LOOKUP_REVAL;

	error = path_walk(pathname, &nd);

	if (error) {

		if (nd.root.mnt)

			path_put(&nd.root);

		return ERR_PTR(error);

		filp = ERR_PTR(error);

		goto out;

	}

	if (unlikely(!audit_dummy_context()))

		audit_inode(pathname, nd.path.dentry);
@@ -1847,9 +1846,7 @@ struct file *do_filp_open(int dfd, const char *pathname, 
	filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);

	if (!filp)

		goto do_link;

	if (nd.root.mnt)

		path_put(&nd.root);

	return filp;

	goto out;



exit_dput:

	path_put_conditional(&path, &nd);
@@ -1857,9 +1854,15 @@ struct file *do_filp_open(int dfd, const char *pathname, 
		release_open_intent(&nd);

exit_parent:

	path_put(&nd.path);

	filp = ERR_PTR(error);

out:

	if (nd.root.mnt)

		path_put(&nd.root);

	return ERR_PTR(error);

	if (filp == ERR_PTR(-ESTALE) && !force_reval) {

		force_reval = 1;

		goto reval;

	}

	return filp;



do_link:

	error = -ELOOP;
@@ -1887,13 +1890,8 @@ struct file *do_filp_open(int dfd, const char *pathname, 
		 * with "intent.open".

		 */

		release_open_intent(&nd);

		if (nd.root.mnt)

			path_put(&nd.root);

		if (error == -ESTALE && !force_reval) {

			force_reval = 1;

			goto reval;

		}

		return ERR_PTR(error);

		filp = ERR_PTR(error);

		goto out;

	}

	nd.flags &= ~LOOKUP_PARENT;

	filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
@@ -1901,9 +1899,7 @@ struct file *do_filp_open(int dfd, const char *pathname, 
		__putname(nd.last.name);

	if (!filp)

		goto do_link;

	if (nd.root.mnt)

		path_put(&nd.root);

	return filp;

	goto out;

}



/**