moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename __filename_parentat() to filename_parentat()

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2021-09-07 15:57:42 -04:00
parent 0766ec82e5
commit c5f563f9e9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/namei.c
View File

@@ -2515,7 +2515,7 @@ static int path_parentat(struct nameidata *nd, unsigned flags,
} }
/* Note: this does not consume "name" */ /* 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, unsigned int flags, struct path *parent,
struct qstr *last, int *type) struct qstr *last, int *type)
{ {
@@ -2546,7 +2546,7 @@ static struct dentry *__kern_path_locked(struct filename *name, struct path *pat
struct qstr last; struct qstr last;
int type, error; 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) if (error)
return ERR_PTR(error); return ERR_PTR(error);
if (unlikely(type != LAST_NORM)) { if (unlikely(type != LAST_NORM)) {
@@ -3633,7 +3633,7 @@ static struct dentry *__filename_create(int dfd, struct filename *name,
*/ */
lookup_flags &= LOOKUP_REVAL; 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) if (error)
return ERR_PTR(error); return ERR_PTR(error);
@@ -3995,7 +3995,7 @@ int do_rmdir(int dfd, struct filename *name)
int type; int type;
unsigned int lookup_flags = 0; unsigned int lookup_flags = 0;
retry: retry:
error = __filename_parentat(dfd, name, lookup_flags, &path, &last, &type); error = filename_parentat(dfd, name, lookup_flags, &path, &last, &type);
if (error) if (error)
goto exit1; goto exit1;
@@ -4136,7 +4136,7 @@ int do_unlinkat(int dfd, struct filename *name)
struct inode *delegated_inode = NULL; struct inode *delegated_inode = NULL;
unsigned int lookup_flags = 0; unsigned int lookup_flags = 0;
retry: retry:
error = __filename_parentat(dfd, name, lookup_flags, &path, &last, &type); error = filename_parentat(dfd, name, lookup_flags, &path, &last, &type);
if (error) if (error)
goto exit1; goto exit1;
@@ -4688,12 +4688,12 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd,
target_flags = 0; target_flags = 0;
retry: retry:
error = __filename_parentat(olddfd, from, lookup_flags, &old_path, error = filename_parentat(olddfd, from, lookup_flags, &old_path,
&old_last, &old_type); &old_last, &old_type);
if (error) if (error)
goto put_names; 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); &new_type);
if (error) if (error)
goto exit1; goto exit1;