diff options
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | fs/ecryptfs/file.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f35a259a6564..73a5f63fb169 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2890,8 +2890,8 @@ F: drivers/media/dvb-frontends/ec100* | |||
2890 | 2890 | ||
2891 | ECRYPT FILE SYSTEM | 2891 | ECRYPT FILE SYSTEM |
2892 | M: Tyler Hicks <tyhicks@canonical.com> | 2892 | M: Tyler Hicks <tyhicks@canonical.com> |
2893 | M: Dustin Kirkland <dustin.kirkland@gazzang.com> | ||
2894 | L: ecryptfs@vger.kernel.org | 2893 | L: ecryptfs@vger.kernel.org |
2894 | W: http://ecryptfs.org | ||
2895 | W: https://launchpad.net/ecryptfs | 2895 | W: https://launchpad.net/ecryptfs |
2896 | S: Supported | 2896 | S: Supported |
2897 | F: Documentation/filesystems/ecryptfs.txt | 2897 | F: Documentation/filesystems/ecryptfs.txt |
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 201f0a0d6b0a..a7abbea2c096 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c | |||
@@ -295,6 +295,12 @@ static int ecryptfs_release(struct inode *inode, struct file *file) | |||
295 | static int | 295 | static int |
296 | ecryptfs_fsync(struct file *file, loff_t start, loff_t end, int datasync) | 296 | ecryptfs_fsync(struct file *file, loff_t start, loff_t end, int datasync) |
297 | { | 297 | { |
298 | int rc; | ||
299 | |||
300 | rc = filemap_write_and_wait(file->f_mapping); | ||
301 | if (rc) | ||
302 | return rc; | ||
303 | |||
298 | return vfs_fsync(ecryptfs_file_to_lower(file), datasync); | 304 | return vfs_fsync(ecryptfs_file_to_lower(file), datasync); |
299 | } | 305 | } |
300 | 306 | ||