Commit 7149f255 authored by Tyler Hicks's avatar Tyler Hicks

eCryptfs: Write out all dirty pages just before releasing the lower file

Fixes a regression caused by:

821f7494 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/1047261Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
Reported-by: default avatarArtemy Tregubenko <me@arty.name>
Tested-by: default avatarArtemy Tregubenko <me@arty.name>
Tested-by: default avatarColin Ian King <colin.king@canonical.com>
parent e9bd8f16
...@@ -162,6 +162,7 @@ void ecryptfs_put_lower_file(struct inode *inode) ...@@ -162,6 +162,7 @@ void ecryptfs_put_lower_file(struct inode *inode)
inode_info = ecryptfs_inode_to_private(inode); inode_info = ecryptfs_inode_to_private(inode);
if (atomic_dec_and_mutex_lock(&inode_info->lower_file_count, if (atomic_dec_and_mutex_lock(&inode_info->lower_file_count,
&inode_info->lower_file_mutex)) { &inode_info->lower_file_mutex)) {
filemap_write_and_wait(inode->i_mapping);
fput(inode_info->lower_file); fput(inode_info->lower_file);
inode_info->lower_file = NULL; inode_info->lower_file = NULL;
mutex_unlock(&inode_info->lower_file_mutex); mutex_unlock(&inode_info->lower_file_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment