lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ecryptfs: use zero_user_page

Browse Source 
Use zero_user_page() instead of open-coding it.

Signed-off-by: Nate Diller <nate.diller@gmail.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Nate Diller
2007-05-16 22:11:17 -07:00
committed by Linus Torvalds
parent 71ce92f3fa
commit c9f2875b79
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/ecryptfs/mmap.c
View File

@@ -364,18 +364,14 @@ static int fill_zeros_to_end_of_page(struct page *page, unsigned int to)
{ {
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
int end_byte_in_page; int end_byte_in_page;
char *page_virt;
if ((i_size_read(inode) / PAGE_CACHE_SIZE) != page->index) if ((i_size_read(inode) / PAGE_CACHE_SIZE) != page->index)
goto out; goto out;
end_byte_in_page = i_size_read(inode) % PAGE_CACHE_SIZE; end_byte_in_page = i_size_read(inode) % PAGE_CACHE_SIZE;
if (to > end_byte_in_page) if (to > end_byte_in_page)
end_byte_in_page = to; end_byte_in_page = to;
page_virt = kmap_atomic(page, KM_USER0); zero_user_page(page, end_byte_in_page,
memset((page_virt + end_byte_in_page), 0, PAGE_CACHE_SIZE - end_byte_in_page, KM_USER0);
(PAGE_CACHE_SIZE - end_byte_in_page));
kunmap_atomic(page_virt, KM_USER0);
flush_dcache_page(page);
out: out:
return 0; return 0;
} }
@@ -740,7 +736,6 @@ int write_zeros(struct file *file, pgoff_t index, int start, int num_zeros)
{ {
int rc = 0; int rc = 0;
struct page *tmp_page; struct page *tmp_page;
char *tmp_page_virt;
tmp_page = ecryptfs_get1page(file, index); tmp_page = ecryptfs_get1page(file, index);
if (IS_ERR(tmp_page)) { if (IS_ERR(tmp_page)) {
@@ -757,10 +752,7 @@ int write_zeros(struct file *file, pgoff_t index, int start, int num_zeros)
page_cache_release(tmp_page); page_cache_release(tmp_page);
goto out; goto out;
} }
tmp_page_virt = kmap_atomic(tmp_page, KM_USER0); zero_user_page(tmp_page, start, num_zeros, 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); rc = ecryptfs_commit_write(file, tmp_page, start, start + num_zeros);
if (rc < 0) { if (rc < 0) {
ecryptfs_printk(KERN_ERR, "Error attempting to write zero's " ecryptfs_printk(KERN_ERR, "Error attempting to write zero's "