iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fuse: clean up fsync

Browse Source 
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>
This commit is contained in:
Miklos Szeredi 2014-04-28 14:19:23 +02:00
parent 93d2269d2f
commit 22401e7b7a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/fuse/file.c
View File

@ -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)) {