diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 16:21:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 16:21:44 -0700 |
| commit | b8e9dbacdd60c5a20ab2c77c08f047b2b990f303 (patch) | |
| tree | 5778963b48646331d9e4706a40c7b246f660c008 | |
| parent | e4327859341f2d3a93b4b6fef2ea483eac1c270c (diff) | |
| parent | bc5abcf7e411b889f73ea2a90439071a0f451011 (diff) | |
| download | linux-3.10-b8e9dbacdd60c5a20ab2c77c08f047b2b990f303.tar.gz linux-3.10-b8e9dbacdd60c5a20ab2c77c08f047b2b990f303.tar.bz2 linux-3.10-b8e9dbacdd60c5a20ab2c77c08f047b2b990f303.zip | |
Merge tag 'ecryptfs-3.10-rc5-msync' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Pull ecryptfs fixes from Tyler Hicks:
- Fixes how eCryptfs handles msync to sync both the upper and lower
file
- A couple of MAINTAINERS updates
* tag 'ecryptfs-3.10-rc5-msync' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: Check return of filemap_write_and_wait during fsync
Update eCryptFS maintainers
ecryptfs: fixed msync to flush data
| -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 f35a259a656..73a5f63fb16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2890,8 +2890,8 @@ F: drivers/media/dvb-frontends/ec100* ECRYPT FILE SYSTEM M: Tyler Hicks <tyhicks@canonical.com> -M: Dustin Kirkland <dustin.kirkland@gazzang.com> L: ecryptfs@vger.kernel.org +W: http://ecryptfs.org W: https://launchpad.net/ecryptfs S: Supported F: Documentation/filesystems/ecryptfs.txt diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 201f0a0d6b0..a7abbea2c09 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) static int ecryptfs_fsync(struct file *file, loff_t start, loff_t end, int datasync) { + int rc; + + rc = filemap_write_and_wait(file->f_mapping); + if (rc) + return rc; + return vfs_fsync(ecryptfs_file_to_lower(file), datasync); } |