[094/141] ecryptfs: fixed msync to flush data

Steven Rostedt
2013-07-03T19:07:44Z

[-- Attachment #1: 0094-ecryptfs-fixed-msync-to-flush-data.patch --]
[-- Type: text/plain, Size: 1248 bytes --]

3.6.11.6 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Paul Taysom <taysom@chromium.org>

[ Upstream commit c15cddd900e867c5adfb3c79596479dc5975f743 ]

When msync is called on a memory mapped file, that
data is not flushed to the disk.

In Linux, msync calls fsync for the file. For ecryptfs,
fsync just calls the lower level file system's fsync.
Changed the ecryptfs fsync code to call filemap_write_and_wait
before calling the lower level fsync.

Addresses the problem described in http://crbug.com/239536

Signed-off-by: Paul Taysom <taysom@chromium.org>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Cc: stable@vger.kernel.org # v3.6+
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
fs/ecryptfs/file.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index d45ba45..4f9a25e 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -296,6 +296,7 @@ static int ecryptfs_release(struct inode *inode, struct file *file)
static int
ecryptfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
{
+ filemap_write_and_wait(file->f_mapping);
return vfs_fsync(ecryptfs_file_to_lower(file), datasync);
}

--
1.7.10.4