diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-24 11:42:13 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-24 11:42:13 -0700 |
| commit | 3fe05bd9980df7207a35b4841a94dc2875e86960 (patch) | |
| tree | b5bb9287088955d2b4b4552b4a4ca9c4c40769a4 /fs/ecryptfs/main.c | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
Merge tag 'v3.6-rc6' into devel-dt
Linux 3.6-rc6
Diffstat (limited to 'fs/ecryptfs/main.c')
| -rw-r--r-- | fs/ecryptfs/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 2768138eefe..9b627c15010 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -162,6 +162,7 @@ void ecryptfs_put_lower_file(struct inode *inode) inode_info = ecryptfs_inode_to_private(inode); if (atomic_dec_and_mutex_lock(&inode_info->lower_file_count, &inode_info->lower_file_mutex)) { + filemap_write_and_wait(inode->i_mapping); fput(inode_info->lower_file); inode_info->lower_file = NULL; mutex_unlock(&inode_info->lower_file_mutex); |