Skip to content

Commit a9900a2

Browse files
author
Al Viro
committed
switch __getname_maybe_null() to CLASS(filename_flags)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 7ca83f8 commit a9900a2

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

fs/namei.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ struct filename *getname_uflags(const char __user *filename, int uflags)
227227

228228
struct filename *__getname_maybe_null(const char __user *pathname)
229229
{
230-
struct filename *name;
231230
char c;
232231

233232
/* try to save on allocations; loss on um, though */
@@ -236,12 +235,11 @@ struct filename *__getname_maybe_null(const char __user *pathname)
236235
if (!c)
237236
return NULL;
238237

239-
name = getname_flags(pathname, LOOKUP_EMPTY);
240-
if (!IS_ERR(name) && !(name->name[0])) {
241-
putname(name);
242-
name = NULL;
243-
}
244-
return name;
238+
CLASS(filename_flags, name)(pathname, LOOKUP_EMPTY);
239+
/* empty pathname translates to NULL */
240+
if (!IS_ERR(name) && !(name->name[0]))
241+
return NULL;
242+
return no_free_ptr(name);
245243
}
246244

247245
struct filename *getname_kernel(const char * filename)

0 commit comments

Comments
 (0)