diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-09-28 05:37:32 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-09-28 05:37:32 +0200 |
| commit | bf5308344527d015ac9a6d2bda4ad4d40fd7d943 (patch) | |
| tree | 566e61e2cfc648c374d15cfc8c661b73e1a471f8 /fs/ecryptfs/file.c | |
| parent | Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next (diff) | |
| parent | Linux 3.6-rc7 (diff) | |
| download | linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.xz linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.zip | |
Merge tag 'v3.6-rc7' into next
Linux 3.6-rc7
Requested by David Howells so he can merge his key susbsystem work into
my tree with requisite -linus changesets.
Diffstat (limited to 'fs/ecryptfs/file.c')
| -rw-r--r-- | fs/ecryptfs/file.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 44ce5c6a541d..d45ba4568128 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c @@ -275,8 +275,14 @@ out: 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) |