[PATCH v1 10/13] fuse: clean up fuse_update_get_attr()

[Joanne Koong <joannelkoong@gmail.com>]

Consolidate logic for determining sync and return early from the sync
path to reduce if-else nesting. No functional changes.

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

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index cb34138d083b..4f58adb0fdae 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1529,13 +1529,10 @@ static int fuse_update_get_attr(struct mnt_idmap *idmap, struct inode *inode,
 	if (fc->no_statx)
 		request_mask &= STATX_BASIC_STATS;
 
-	if (!request_mask)
+	if (!request_mask || flags & AT_STATX_DONT_SYNC)
 		sync = false;
-	else if (flags & AT_STATX_FORCE_SYNC)
-		sync = true;
-	else if (flags & AT_STATX_DONT_SYNC)
-		sync = false;
-	else if (request_mask & inval_mask & ~cache_mask)
+	else if ((flags & AT_STATX_FORCE_SYNC) ||
+		 (request_mask & inval_mask & ~cache_mask))
 		sync = true;
 	else
 		sync = time_before64(fi->i_time, get_jiffies_64());
@@ -1550,10 +1547,12 @@ static int fuse_update_get_attr(struct mnt_idmap *idmap, struct inode *inode,
 				err = 0;
 				goto retry;
 			}
-		} else {
-			err = fuse_do_getattr(idmap, inode, stat, file);
+			return err;
 		}
-	} else if (stat) {
+		return fuse_do_getattr(idmap, inode, stat, file);
+	}
+
+	if (stat) {
 		generic_fillattr(idmap, request_mask, inode, stat);
 		stat->mode = fi->orig_i_mode;
 		stat->ino = fi->orig_ino;
-- 
2.52.0