From 07ca2ec8d4dc544a814d7993594d371216372ad7 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@canonical.com>
Date: Wed, 12 Sep 2012 18:38:00 -0700
Subject: [PATCH] --- yaml --- r: 322865 b: refs/heads/master c:
 64e6651dcc10e9d2cc6230208a8e6c2cfd19ae18 h: refs/heads/master i:   322863:
 a0752b03df0980df940cc2ec2e8eefc1b442ae9a v: v3

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

diff --git a/[refs] b/[refs]
index 67715aee6027..a325a57c2b42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7149f2558d5b5b988726662fe58b1c388337805b
+refs/heads/master: 64e6651dcc10e9d2cc6230208a8e6c2cfd19ae18
diff --git a/trunk/fs/ecryptfs/file.c b/trunk/fs/ecryptfs/file.c
index 44ce5c6a541d..d45ba4568128 100644
--- a/trunk/fs/ecryptfs/file.c
+++ b/trunk/fs/ecryptfs/file.c
@@ -275,8 +275,14 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
 
 static int ecryptfs_flush(struct file *file, fl_owner_t td)
 {
-	return file->f_mode & FMODE_WRITE
-	       ? filemap_write_and_wait(file->f_mapping) : 0;
+	struct file *lower_file = ecryptfs_file_to_lower(file);
+
+	if (lower_file->f_op && lower_file->f_op->flush) {
+		filemap_write_and_wait(file->f_mapping);
+		return lower_file->f_op->flush(lower_file, td);
+	}
+
+	return 0;
 }
 
 static int ecryptfs_release(struct inode *inode, struct file *file)