Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8e9dbac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ecryptfs-3.10-rc5-msync' of... 

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
parents e4327859 bc5abcf7

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/ecryptfs/file.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

}