summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-02-22 19:44:00 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2015-03-24 17:19:15 -0400
commit668696dcbb1b184f8758ba9903c373c4960174a9 (patch)
tree3b3e36efabb4ac41312afa5f18cbefe9a6ced335
parent5eb6b495c60ef865324a81898eeb18062fd81662 (diff)
downloadlinux-668696dcbb1b184f8758ba9903c373c4960174a9.tar.bz2
switch path_mountpoint() to struct filename
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 92b1f00cc05a..e1d18522db31 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2337,12 +2337,13 @@ out:
* Returns 0 and "path" will be valid on success; Returns error otherwise.
*/
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;
int err;
- err = path_init(dfd, name, flags, &nd);
+ err = path_init(dfd, name->name, flags, &nd);
if (unlikely(err))
goto out;
@@ -2366,20 +2367,20 @@ out:
}
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)
{
int error;
- if (IS_ERR(s))
- return PTR_ERR(s);
- error = path_mountpoint(dfd, s->name, path, flags | LOOKUP_RCU);
+ if (IS_ERR(name))
+ return PTR_ERR(name);
+ error = path_mountpoint(dfd, name, path, flags | LOOKUP_RCU);
if (unlikely(error == -ECHILD))
- error = path_mountpoint(dfd, s->name, path, flags);
+ error = path_mountpoint(dfd, name, path, flags);
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))
- audit_inode(s, path->dentry, 0);
- putname(s);
+ audit_inode(name, path->dentry, 0);
+ putname(name);
return error;
}