[PATCH v1 03/13] fuse: clean up fuse_lookup()

[Joanne Koong <joannelkoong@gmail.com>]

Remove gotos with direct returns and simplify the d_splice_alias error
path. No functional changes.

Signed-off-by: Joanne Koong <joannelkoong@gmail.com>
---
 fs/fuse/dir.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 31dc87cfa1af..112d979c49c5 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -625,21 +625,19 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
 	err = fuse_lookup_name(dir->i_sb, get_node_id(dir), &entry->d_name,
 			       &outarg, &inode);
 	fuse_unlock_inode(dir, locked);
-	if (err == -ENOENT) {
+	if (err == -ENOENT)
 		outarg_valid = false;
-		err = 0;
-	}
-	if (err)
-		goto out_err;
+	else if (err)
+		return ERR_PTR(err);
 
-	err = -EIO;
-	if (inode && get_node_id(inode) == FUSE_ROOT_ID)
-		goto out_iput;
+	if (inode && get_node_id(inode) == FUSE_ROOT_ID) {
+		iput(inode);
+		return ERR_PTR(-EIO);
+	}
 
 	newent = d_splice_alias(inode, entry);
-	err = PTR_ERR(newent);
 	if (IS_ERR(newent))
-		goto out_err;
+		return newent;
 
 	entry = newent ? newent : entry;
 	entry->d_time = epoch;
@@ -651,11 +649,6 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
 	if (inode)
 		fuse_advise_use_readdirplus(dir);
 	return newent;
-
- out_iput:
-	iput(inode);
- out_err:
-	return ERR_PTR(err);
 }
 
 static int get_security_context(struct dentry *entry, umode_t mode,
-- 
2.52.0