Commit c5f563f9 authored by Al Viro's avatar Al Viro
Browse files

rename __filename_parentat() to filename_parentat() 



... in separate commit, to avoid noise in previous one

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

fs/namei.c

+9 −9
Original line number Diff line number Diff line
@@ -2515,7 +2515,7 @@ static int path_parentat(struct nameidata *nd, unsigned flags, 
}



/* Note: this does not consume "name" */

static int __filename_parentat(int dfd, struct filename *name,

static int filename_parentat(int dfd, struct filename *name,

			     unsigned int flags, struct path *parent,

			     struct qstr *last, int *type)

{
@@ -2546,7 +2546,7 @@ static struct dentry *__kern_path_locked(struct filename *name, struct path *pat 
	struct qstr last;

	int type, error;



	error = __filename_parentat(AT_FDCWD, name, 0, path, &last, &type);

	error = filename_parentat(AT_FDCWD, name, 0, path, &last, &type);

	if (error)

		return ERR_PTR(error);

	if (unlikely(type != LAST_NORM)) {
@@ -3633,7 +3633,7 @@ static struct dentry *__filename_create(int dfd, struct filename *name, 
	 */

	lookup_flags &= LOOKUP_REVAL;



	error = __filename_parentat(dfd, name, lookup_flags, path, &last, &type);

	error = filename_parentat(dfd, name, lookup_flags, path, &last, &type);

	if (error)

		return ERR_PTR(error);
@@ -3995,7 +3995,7 @@ int do_rmdir(int dfd, struct filename *name) 
	int type;

	unsigned int lookup_flags = 0;

retry:

	error = __filename_parentat(dfd, name, lookup_flags, &path, &last, &type);

	error = filename_parentat(dfd, name, lookup_flags, &path, &last, &type);

	if (error)

		goto exit1;
@@ -4136,7 +4136,7 @@ int do_unlinkat(int dfd, struct filename *name) 
	struct inode *delegated_inode = NULL;

	unsigned int lookup_flags = 0;

retry:

	error = __filename_parentat(dfd, name, lookup_flags, &path, &last, &type);

	error = filename_parentat(dfd, name, lookup_flags, &path, &last, &type);

	if (error)

		goto exit1;
@@ -4688,12 +4688,12 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd, 
		target_flags = 0;



retry:

	error = __filename_parentat(olddfd, from, lookup_flags, &old_path,

	error = filename_parentat(olddfd, from, lookup_flags, &old_path,

				  &old_last, &old_type);

	if (error)

		goto put_names;



	error = __filename_parentat(newdfd, to, lookup_flags, &new_path, &new_last,

	error = filename_parentat(newdfd, to, lookup_flags, &new_path, &new_last,

				  &new_type);

	if (error)

		goto exit1;