[PATCH v1 06/13] fuse: clean up fuse_rename2()

[Joanne Koong <joannelkoong@gmail.com>]

Move flag validation into the flags branch and return early to eliminate
the else block. No functional changes.

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

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 4a6c9e2340bb..b87236af4bf7 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1293,10 +1293,10 @@ static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir,
 	if (fuse_is_bad(olddir))
 		return -EIO;
 
-	if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
-		return -EINVAL;
-
 	if (flags) {
+		if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
+			return -EINVAL;
+
 		if (fc->no_rename2 || fc->minor < 23)
 			return -EINVAL;
 
@@ -1308,13 +1308,12 @@ static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir,
 			fc->no_rename2 = 1;
 			err = -EINVAL;
 		}
-	} else {
-		err = fuse_rename_common(&invalid_mnt_idmap, olddir, oldent, newdir, newent, 0,
-					 FUSE_RENAME,
-					 sizeof(struct fuse_rename_in));
+		return err;
 	}
 
-	return err;
+	return fuse_rename_common(&invalid_mnt_idmap, olddir, oldent, newdir,
+				  newent, 0, FUSE_RENAME,
+				  sizeof(struct fuse_rename_in));
 }
 
 static int fuse_link(struct dentry *entry, struct inode *newdir,
-- 
2.52.0