[09/21] namei: move putname() call into filename_lookup()
diff mbox

Message ID 1431555975-25997-9-git-send-email-viro@ZenIV.linux.org.uk
State New
Headers show

Commit Message

Al Viro May 13, 2015, 10:26 p.m. UTC
From: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/namei.c | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

Patch
diff mbox

diff --git a/fs/namei.c b/fs/namei.c
index 937ec33..17350c0 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2132,6 +2132,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;
 }
 
@@ -2208,13 +2209,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);
 
@@ -2230,21 +2227,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);
 
@@ -2304,15 +2299,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,