[v3] fuse: clean up fuse_lookup_name()

Commit Message

Dan Carpenter Oct. 25, 2016, 9:37 p.m. UTC

We check for !outarg->nodeid twice.  The first time we return success
and the next time (which is dead code) we return -EIO.  The correct
return is the current success return and we should delete the dead code.

Signed-off-by: Dan Carpenter <[e-mail]>
---
I sent this patch last year, but the first time I changed the function
to return -EIO, then in the second patch I messed up so that if
fuse_valid_type() was false then we still returned success.  But
hopefully version 3 is correct.

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index b3ebe512d64c..6277af3e9c45 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -321,13 +321,14 @@  int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name
 
 	fuse_lookup_init(fc, &args, nodeid, name, outarg);
 	err = fuse_simple_request(fc, &args);
-	/* Zero nodeid is same as -ENOENT, but with valid timeout */
-	if (err || !outarg->nodeid)
+	if (err)
 		goto out_put_forget;
 
-	err = -EIO;
+	/* Zero nodeid is same as -ENOENT, but with valid timeout */
 	if (!outarg->nodeid)
 		goto out_put_forget;
+
+	err = -EIO;
 	if (!fuse_valid_type(outarg->attr.mode))
 		goto out_put_forget;