@@ -2515,7 +2515,7 @@ static int path_parentat(struct nameidata *nd, unsigned flags,
25152515}
25162516
25172517/* Note: this does not consume "name" */
2518- static int __filename_parentat (int dfd , struct filename * name ,
2518+ static int filename_parentat (int dfd , struct filename * name ,
25192519 unsigned int flags , struct path * parent ,
25202520 struct qstr * last , int * type )
25212521{
@@ -2546,7 +2546,7 @@ static struct dentry *__kern_path_locked(struct filename *name, struct path *pat
25462546 struct qstr last ;
25472547 int type , error ;
25482548
2549- error = __filename_parentat (AT_FDCWD , name , 0 , path , & last , & type );
2549+ error = filename_parentat (AT_FDCWD , name , 0 , path , & last , & type );
25502550 if (error )
25512551 return ERR_PTR (error );
25522552 if (unlikely (type != LAST_NORM )) {
@@ -3633,7 +3633,7 @@ static struct dentry *__filename_create(int dfd, struct filename *name,
36333633 */
36343634 lookup_flags &= LOOKUP_REVAL ;
36353635
3636- error = __filename_parentat (dfd , name , lookup_flags , path , & last , & type );
3636+ error = filename_parentat (dfd , name , lookup_flags , path , & last , & type );
36373637 if (error )
36383638 return ERR_PTR (error );
36393639
@@ -3995,7 +3995,7 @@ int do_rmdir(int dfd, struct filename *name)
39953995 int type ;
39963996 unsigned int lookup_flags = 0 ;
39973997retry :
3998- error = __filename_parentat (dfd , name , lookup_flags , & path , & last , & type );
3998+ error = filename_parentat (dfd , name , lookup_flags , & path , & last , & type );
39993999 if (error )
40004000 goto exit1 ;
40014001
@@ -4136,7 +4136,7 @@ int do_unlinkat(int dfd, struct filename *name)
41364136 struct inode * delegated_inode = NULL ;
41374137 unsigned int lookup_flags = 0 ;
41384138retry :
4139- error = __filename_parentat (dfd , name , lookup_flags , & path , & last , & type );
4139+ error = filename_parentat (dfd , name , lookup_flags , & path , & last , & type );
41404140 if (error )
41414141 goto exit1 ;
41424142
@@ -4688,13 +4688,13 @@ int do_renameat2(int olddfd, struct filename *from, int newdfd,
46884688 target_flags = 0 ;
46894689
46904690retry :
4691- error = __filename_parentat (olddfd , from , lookup_flags , & old_path ,
4692- & old_last , & old_type );
4691+ error = filename_parentat (olddfd , from , lookup_flags , & old_path ,
4692+ & old_last , & old_type );
46934693 if (error )
46944694 goto put_names ;
46954695
4696- error = __filename_parentat (newdfd , to , lookup_flags , & new_path , & new_last ,
4697- & new_type );
4696+ error = filename_parentat (newdfd , to , lookup_flags , & new_path , & new_last ,
4697+ & new_type );
46984698 if (error )
46994699 goto exit1 ;
47004700
0 commit comments