From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 28 Apr 2014 12:19:23 +0000 (+0200)
Subject: fuse: clean up fsync
X-Git-Tag: MMI-PSA29.97-13-9~12246^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22401e7b7a686bff02549cd648ba6f73f8dba868;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

fuse: clean up fsync

Don't need to start I/O twice (once without i_mutex and one within).

Also make sure that even if the userspace filesystem doesn't support FSYNC
we do all the steps other than sending the message.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 3391f6a840bd..65586a567d0d 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -490,13 +490,6 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
 	if (is_bad_inode(inode))
 		return -EIO;
 
-	err = filemap_write_and_wait_range(inode->i_mapping, start, end);
-	if (err)
-		return err;
-
-	if ((!isdir && fc->no_fsync) || (isdir && fc->no_fsyncdir))
-		return 0;
-
 	mutex_lock(&inode->i_mutex);
 
 	/*
@@ -504,7 +497,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
 	 * wait for all outstanding writes, before sending the FSYNC
 	 * request.
 	 */
-	err = write_inode_now(inode, 0);
+	err = filemap_write_and_wait_range(inode->i_mapping, start, end);
 	if (err)
 		goto out;
 
@@ -515,6 +508,8 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
 		if (err)
 			goto out;
 	}
+	if ((!isdir && fc->no_fsync) || (isdir && fc->no_fsyncdir))
+		goto out;
 
 	req = fuse_get_req_nopages(fc);
 	if (IS_ERR(req)) {