clean erofs_lookup()

d_splice_alias() does the right thing when given
ERR_PTR(-E...) for inode.  No need for gotos, multiple
returns, etc. in there.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c
index 546a47156101ab73784072c2826be383549c5c23..8cf0617d4ea01108c961c6fd3099d7752fdc4c31 100644 (file)
--- a/drivers/staging/erofs/namei.c
+++ b/drivers/staging/erofs/namei.c
@@ -223,18 +223,13 @@ static struct dentry *erofs_lookup(struct inode *dir,
        if (err == -ENOENT) {
                /* negative dentry */
                inode = NULL;
-               goto negative_out;
-       } else if (unlikely(err))
-               return ERR_PTR(err);
-
-       debugln("%s, %s (nid %llu) found, d_type %u", __func__,
-               dentry->d_name.name, nid, d_type);
-
-       inode = erofs_iget(dir->i_sb, nid, d_type == EROFS_FT_DIR);
-       if (IS_ERR(inode))
-               return ERR_CAST(inode);
-
-negative_out:
+       } else if (unlikely(err)) {
+               inode = ERR_PTR(err);
+       } else {
+               debugln("%s, %s (nid %llu) found, d_type %u", __func__,
+                       dentry->d_name.name, nid, d_type);
+               inode = erofs_iget(dir->i_sb, nid, d_type == EROFS_FT_DIR);
+       }
        return d_splice_alias(inode, dentry);
 }