iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch path_lookupat() to struct filename

Browse Source 
all callers were passing it ->name of some struct filename

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-02-22 19:40:53 -05:00
parent 94b5d2621a
commit 5eb6b495c6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/namei.c
View File

@ -1969,7 +1969,7 @@ static inline int lookup_last(struct nameidata *nd, struct path *path)
} }
/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ /* Returns 0 and nd will be valid on success; Retuns error, otherwise. */
static int path_lookupat(int dfd, const char *name, static int path_lookupat(int dfd, const struct filename *name,
unsigned int flags, struct nameidata *nd) unsigned int flags, struct nameidata *nd)
{ {
struct path path; struct path path;
@ -1989,7 +1989,7 @@ static int path_lookupat(int dfd, const char *name,
* be handled by restarting a traditional ref-walk (which will always * be handled by restarting a traditional ref-walk (which will always
* be able to complete). * be able to complete).
*/ */
err = path_init(dfd, name, flags, nd); err = path_init(dfd, name->name, flags, nd);
if (!err && !(flags & LOOKUP_PARENT)) { if (!err && !(flags & LOOKUP_PARENT)) {
err = lookup_last(nd, &path); err = lookup_last(nd, &path);
while (err > 0) { while (err > 0) {
@ -2024,12 +2024,11 @@ static int path_lookupat(int dfd, const char *name,
static int filename_lookup(int dfd, struct filename *name, static int filename_lookup(int dfd, struct filename *name,
unsigned int flags, struct nameidata *nd) unsigned int flags, struct nameidata *nd)
{ {
int retval = path_lookupat(dfd, name->name, flags | LOOKUP_RCU, nd); int retval = path_lookupat(dfd, name, flags | LOOKUP_RCU, nd);
if (unlikely(retval == -ECHILD)) if (unlikely(retval == -ECHILD))
retval = path_lookupat(dfd, name->name, flags, nd); retval = path_lookupat(dfd, name, flags, nd);
if (unlikely(retval == -ESTALE)) if (unlikely(retval == -ESTALE))
retval = path_lookupat(dfd, name->name, retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
flags | LOOKUP_REVAL, nd);
if (likely(!retval)) if (likely(!retval))
audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT); audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
@ -3153,7 +3152,7 @@ static int do_tmpfile(int dfd, struct filename *pathname,
static const struct qstr name = QSTR_INIT("/", 1); static const struct qstr name = QSTR_INIT("/", 1);
struct dentry *dentry, *child; struct dentry *dentry, *child;
struct inode *dir; struct inode *dir;
int error = path_lookupat(dfd, pathname->name, int error = path_lookupat(dfd, pathname,
flags | LOOKUP_DIRECTORY, nd); flags | LOOKUP_DIRECTORY, nd);
if (unlikely(error)) if (unlikely(error))
return error; return error;