1 files changed, 15 insertions, 1 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index d572c900bb0f..54d638f9ba1c 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -405,7 +405,8 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
         else
                 fuse_invalidate_entry_cache(entry);
 
-        fuse_advise_use_readdirplus(dir);
+        if (inode)
+                fuse_advise_use_readdirplus(dir);
         return newent;
 
  out_iput:
@@ -1521,6 +1522,19 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,
                 is_truncate = true;
         }
 
+        /* Flush dirty data/metadata before non-truncate SETATTR */
+        if (is_wb && S_ISREG(inode->i_mode) &&
+            attr->ia_valid &
+                        (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_MTIME_SET |
+                         ATTR_TIMES_SET)) {
+                err = write_inode_now(inode, true);
+                if (err)
+                        return err;
+
+                fuse_set_nowrite(inode);
+                fuse_release_nowrite(inode);
+        }
+
         if (is_truncate) {
                 fuse_set_nowrite(inode);
                 set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);