diff options
| author | Greg Kroah-Hartman <[email protected]> | 2012-09-17 03:42:46 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2012-09-17 03:42:46 +0000 |
| commit | 2bcb132c693566bcb8208cc7ce66b72a4f852ecf (patch) | |
| tree | 6fc4f05ce18140d86aa78a10380a610734aeaef9 /fs/ecryptfs/main.c | |
| parent | USB: serial: io_ti.c: remove dbg() usage (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | kernel-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.tar.gz kernel-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.zip | |
Merge 3.6-rc6 into usb-next
This resolves the merge problems with:
drivers/usb/dwc3/gadget.c
drivers/usb/musb/tusb6010.c
that had been seen in linux-next.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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 2768138eefee..9b627c15010a 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); |