rename __filename_parentat() to filename_parentat()
... in separate commit, to avoid noise in previous one Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
0766ec82e5
commit
c5f563f9e9
18
fs/namei.c
18
fs/namei.c
|
@ -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,13 +4688,13 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd,
|
|||
target_flags = 0;
|
||||
|
||||
retry:
|
||||
error = __filename_parentat(olddfd, from, lookup_flags, &old_path,
|
||||
&old_last, &old_type);
|
||||
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,
|
||||
&new_type);
|
||||
error = filename_parentat(newdfd, to, lookup_flags, &new_path, &new_last,
|
||||
&new_type);
|
||||
if (error)
|
||||
goto exit1;
|
||||
|
||||
|
|
Loading…
Reference in New Issue