diff options
author | Tyler Hicks <tyhicks@canonical.com> | 2012-09-12 18:02:46 -0700 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2012-09-14 09:11:29 -0700 |
commit | 7149f2558d5b5b988726662fe58b1c388337805b (patch) | |
tree | 480ceac128f2c1779bd2a7f97b2075571fb19e95 /fs/ecryptfs | |
parent | e9bd8f1624cb0f647867d6cced79cb26ef3651bf (diff) | |
download | linux-7149f2558d5b5b988726662fe58b1c388337805b.tar.gz linux-7149f2558d5b5b988726662fe58b1c388337805b.tar.bz2 linux-7149f2558d5b5b988726662fe58b1c388337805b.zip |
eCryptfs: Write out all dirty pages just before releasing the lower file
Fixes a regression caused by:
821f749 eCryptfs: Revert to a writethrough cache model
That patch reverted some code (specifically, 32001d6f) that was
necessary to properly handle open() -> mmap() -> close() -> dirty pages
-> munmap(), because the lower file could be closed before the dirty
pages are written out.
Rather than reapplying 32001d6f, this approach is a better way of
ensuring that the lower file is still open in order to handle writing
out the dirty pages. It is called from ecryptfs_release(), while we have
a lock on the lower file pointer, just before the lower file gets the
final fput() and we overwrite the pointer.
https://launchpad.net/bugs/1047261
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reported-by: Artemy Tregubenko <me@arty.name>
Tested-by: Artemy Tregubenko <me@arty.name>
Tested-by: Colin Ian King <colin.king@canonical.com>
Diffstat (limited to 'fs/ecryptfs')
-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); |