switch path_mountpoint() to struct filename
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
5eb6b495c6
Коммит
668696dcbb
21
fs/namei.c
21
fs/namei.c
|
@ -2337,12 +2337,13 @@ out:
|
||||||
* Returns 0 and "path" will be valid on success; Returns error otherwise.
|
* Returns 0 and "path" will be valid on success; Returns error otherwise.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
path_mountpoint(int dfd, const char *name, struct path *path, unsigned int flags)
|
path_mountpoint(int dfd, const struct filename *name, struct path *path,
|
||||||
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
struct nameidata nd;
|
struct nameidata nd;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = path_init(dfd, name, flags, &nd);
|
err = path_init(dfd, name->name, flags, &nd);
|
||||||
if (unlikely(err))
|
if (unlikely(err))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -2366,20 +2367,20 @@ out:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
filename_mountpoint(int dfd, struct filename *s, struct path *path,
|
filename_mountpoint(int dfd, struct filename *name, struct path *path,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
if (IS_ERR(s))
|
if (IS_ERR(name))
|
||||||
return PTR_ERR(s);
|
return PTR_ERR(name);
|
||||||
error = path_mountpoint(dfd, s->name, path, flags | LOOKUP_RCU);
|
error = path_mountpoint(dfd, name, path, flags | LOOKUP_RCU);
|
||||||
if (unlikely(error == -ECHILD))
|
if (unlikely(error == -ECHILD))
|
||||||
error = path_mountpoint(dfd, s->name, path, flags);
|
error = path_mountpoint(dfd, name, path, flags);
|
||||||
if (unlikely(error == -ESTALE))
|
if (unlikely(error == -ESTALE))
|
||||||
error = path_mountpoint(dfd, s->name, path, flags | LOOKUP_REVAL);
|
error = path_mountpoint(dfd, name, path, flags | LOOKUP_REVAL);
|
||||||
if (likely(!error))
|
if (likely(!error))
|
||||||
audit_inode(s, path->dentry, 0);
|
audit_inode(name, path->dentry, 0);
|
||||||
putname(s);
|
putname(name);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче