diff options
| author | Michael Halcrow <mhalcrow@us.ibm.com> | 2007-02-12 00:53:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 09:48:37 -0800 |
| commit | 0a9ac38246b11892ad20a1eb9deb67adf8c0db2f (patch) | |
| tree | a5521698784e54263acda35226522e1d3348f786 /fs/ecryptfs | |
| parent | e2bd99ec5c0e20ed6aeb079fa8f975c2dcd78a2c (diff) | |
| download | kernel-common-0a9ac38246b11892ad20a1eb9deb67adf8c0db2f.tar.gz kernel-common-0a9ac38246b11892ad20a1eb9deb67adf8c0db2f.tar.bz2 kernel-common-0a9ac38246b11892ad20a1eb9deb67adf8c0db2f.zip | |
[PATCH] eCryptfs: add flush_dcache_page() calls
Call flush_dcache_page() after modifying a pagecache by hand.
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs')
| -rw-r--r-- | fs/ecryptfs/mmap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index 3014aa719953..3a6f65c3f14f 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c @@ -238,7 +238,9 @@ int ecryptfs_do_readpage(struct file *file, struct page *page, lower_page_data = kmap_atomic(lower_page, KM_USER1); memcpy(page_data, lower_page_data, PAGE_CACHE_SIZE); kunmap_atomic(lower_page_data, KM_USER1); + flush_dcache_page(lower_page); kunmap_atomic(page_data, KM_USER0); + flush_dcache_page(page); rc = 0; out: if (likely(lower_page)) @@ -322,6 +324,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page) set_header_info(page_virt, crypt_stat); } kunmap_atomic(page_virt, KM_USER0); + flush_dcache_page(page); if (rc) { printk(KERN_ERR "Error reading xattr " "region\n"); @@ -382,6 +385,7 @@ static int fill_zeros_to_end_of_page(struct page *page, unsigned int to) memset((page_virt + end_byte_in_page), 0, (PAGE_CACHE_SIZE - end_byte_in_page)); kunmap_atomic(page_virt, KM_USER0); + flush_dcache_page(page); out: return 0; } @@ -456,6 +460,7 @@ static int ecryptfs_write_inode_size_to_header(struct file *lower_file, header_virt = kmap_atomic(header_page, KM_USER0); memcpy(header_virt, &file_size, sizeof(u64)); kunmap_atomic(header_virt, KM_USER0); + flush_dcache_page(header_page); rc = lower_a_ops->commit_write(lower_file, header_page, 0, 8); if (rc < 0) ecryptfs_printk(KERN_ERR, "Error commiting header page " @@ -742,6 +747,7 @@ int write_zeros(struct file *file, pgoff_t index, int start, int num_zeros) tmp_page_virt = kmap_atomic(tmp_page, KM_USER0); memset(((char *)tmp_page_virt + start), 0, num_zeros); kunmap_atomic(tmp_page_virt, KM_USER0); + flush_dcache_page(tmp_page); rc = ecryptfs_commit_write(file, tmp_page, start, start + num_zeros); if (rc < 0) { ecryptfs_printk(KERN_ERR, "Error attempting to write zero's " |