From 75e0d4230e317c6de4b3368365d0ee7b0c54a9b3 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@canonical.com>
Date: Tue, 4 Jun 2013 10:24:56 -0700
Subject: [PATCH] --- yaml --- r: 376792 b: refs/heads/master c:
 bc5abcf7e411b889f73ea2a90439071a0f451011 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ecryptfs/file.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1bf7e748dd94..747ac99cff79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24a923e4e9a296a8f8ff852109d423ba07616cc4
+refs/heads/master: bc5abcf7e411b889f73ea2a90439071a0f451011
diff --git a/trunk/fs/ecryptfs/file.c b/trunk/fs/ecryptfs/file.c
index 16f509d6fa49..a7abbea2c096 100644
--- a/trunk/fs/ecryptfs/file.c
+++ b/trunk/fs/ecryptfs/file.c
@@ -295,7 +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)
 {
-	filemap_write_and_wait(file->f_mapping);
+	int rc;
+
+	rc = filemap_write_and_wait(file->f_mapping);
+	if (rc)
+		return rc;
+
 	return vfs_fsync(ecryptfs_file_to_lower(file), datasync);
 }