[PATCH v1 12/13] fuse: clean up fuse_dir_open()

[Joanne Koong <joannelkoong@gmail.com>]

Restructure logic to reduce if-else nesting. No functional changes.

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

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index f186bf15c6f0..bdeea7065c5c 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1873,6 +1873,7 @@ static const char *fuse_get_link(struct dentry *dentry, struct inode *inode,
 
 static int fuse_dir_open(struct inode *inode, struct file *file)
 {
+	struct fuse_file *ff;
 	struct fuse_mount *fm = get_fuse_mount(inode);
 	int err;
 
@@ -1884,21 +1885,21 @@ static int fuse_dir_open(struct inode *inode, struct file *file)
 		return err;
 
 	err = fuse_do_open(fm, get_node_id(inode), file, true);
-	if (!err) {
-		struct fuse_file *ff = file->private_data;
+	if (err)
+		return err;
 
-		/*
-		 * Keep handling FOPEN_STREAM and FOPEN_NONSEEKABLE for
-		 * directories for backward compatibility, though it's unlikely
-		 * to be useful.
-		 */
-		if (ff->open_flags & (FOPEN_STREAM | FOPEN_NONSEEKABLE))
-			nonseekable_open(inode, file);
-		if (!(ff->open_flags & FOPEN_KEEP_CACHE))
-			invalidate_inode_pages2(inode->i_mapping);
-	}
+	ff = file->private_data;
 
-	return err;
+	/*
+	 * Keep handling FOPEN_STREAM and FOPEN_NONSEEKABLE for directories for
+	 * backward compatibility, though it's unlikely to be useful.
+	 */
+	if (ff->open_flags & (FOPEN_STREAM | FOPEN_NONSEEKABLE))
+		nonseekable_open(inode, file);
+	if (!(ff->open_flags & FOPEN_KEEP_CACHE))
+		invalidate_inode_pages2(inode->i_mapping);
+
+	return 0;
 }
 
 static int fuse_dir_release(struct inode *inode, struct file *file)
-- 
2.52.0