summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-12 16:40:39 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-15 01:10:40 -0400
commite4bd1c1a95409131ad3948accab98f0d6b8093f0 (patch)
tree641f07fb2c73fbe6a1471dcdc2b653b463ffb332 /fs
parent625b6d105446e82e95ddb28d6fd3d25f84f6c479 (diff)
namei: move putname() call into filename_lookup()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c38
1 files changed, 15 insertions, 23 deletions
diff --git a/fs/namei.c b/fs/namei.c
index f4c9c0774b26..847c61a48078 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2134,6 +2134,7 @@ static int filename_lookup(int dfd, struct filename *name, unsigned flags,
if (likely(!retval))
audit_inode(name, path->dentry, flags & LOOKUP_PARENT);
restore_nameidata(saved_nd);
+ putname(name);
return retval;
}
@@ -2210,13 +2211,9 @@ int kern_path(const char *name, unsigned int flags, struct path *path)
{
struct nameidata nd;
struct filename *filename = getname_kernel(name);
- int res = PTR_ERR(filename);
-
- if (!IS_ERR(filename)) {
- res = filename_lookup(AT_FDCWD, filename, flags, &nd, path);
- putname(filename);
- }
- return res;
+ if (IS_ERR(filename))
+ return PTR_ERR(filename);
+ return filename_lookup(AT_FDCWD, filename, flags, &nd, path);
}
EXPORT_SYMBOL(kern_path);
@@ -2232,21 +2229,19 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
const char *name, unsigned int flags,
struct path *path)
{
+ struct nameidata nd;
struct filename *filename = getname_kernel(name);
- int err = PTR_ERR(filename);
BUG_ON(flags & LOOKUP_PARENT);
+ if (IS_ERR(filename))
+ return PTR_ERR(filename);
+
+ nd.root.dentry = dentry;
+ nd.root.mnt = mnt;
/* the first argument of filename_lookup() is ignored with LOOKUP_ROOT */
- if (!IS_ERR(filename)) {
- struct nameidata nd;
- nd.root.dentry = dentry;
- nd.root.mnt = mnt;
- err = filename_lookup(AT_FDCWD, filename,
+ return filename_lookup(AT_FDCWD, filename,
flags | LOOKUP_ROOT, &nd, path);
- putname(filename);
- }
- return err;
}
EXPORT_SYMBOL(vfs_path_lookup);
@@ -2306,15 +2301,12 @@ int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
{
struct nameidata nd;
struct filename *tmp = getname_flags(name, flags, empty);
- int err = PTR_ERR(tmp);
- if (!IS_ERR(tmp)) {
+ if (IS_ERR(tmp))
+ return PTR_ERR(tmp);
- BUG_ON(flags & LOOKUP_PARENT);
+ BUG_ON(flags & LOOKUP_PARENT);
- err = filename_lookup(dfd, tmp, flags, &nd, path);
- putname(tmp);
- }
- return err;
+ return filename_lookup(dfd, tmp, flags, &nd, path);
}
int user_path_at(int dfd, const char __user *name, unsigned flags,