author: Miklos Szeredi <mszeredi@redhat.com> 2020-05-19 14:50:37 +0200
committer: Miklos Szeredi <mszeredi@redhat.com> 2020-05-19 14:50:37 +0200
commit: 614c026e8a46636198da93ec30719f93975bb26a
parent: cf576c58b3a283333fc6e9a7c1c8e5342fa59b97
Commit Summary:
Diffstat:
1 file changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 262c5e20f324..4aa750d08d62 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -445,10 +445,6 @@ static int fuse_flush(struct file *file, fl_owner_t id)
if (is_bad_inode(inode))
return -EIO;
- err = 0;
- if (fc->no_flush)
- goto inval_attr_out;
-
err = write_inode_now(inode, 1);
if (err)
return err;
@@ -461,6 +457,10 @@ static int fuse_flush(struct file *file, fl_owner_t id)
if (err)
return err;
+ err = 0;
+ if (fc->no_flush)
+ goto inval_attr_out;
+
memset(&inarg, 0, sizeof(inarg));
inarg.fh = ff->fh;
inarg.lock_owner = fuse_lock_owner_id(fc, id);