ext3: use zero_user_page
Use zero_user_page() instead of open-coding it. Signed-off-by: Nate Diller <nate.diller@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
f36dca90e6
commit
0c11d7a9e9
1 changed files with 2 additions and 10 deletions
|
@ -1767,7 +1767,6 @@ static int ext3_block_truncate_page(handle_t *handle, struct page *page,
|
||||||
struct inode *inode = mapping->host;
|
struct inode *inode = mapping->host;
|
||||||
struct buffer_head *bh;
|
struct buffer_head *bh;
|
||||||
int err = 0;
|
int err = 0;
|
||||||
void *kaddr;
|
|
||||||
|
|
||||||
blocksize = inode->i_sb->s_blocksize;
|
blocksize = inode->i_sb->s_blocksize;
|
||||||
length = blocksize - (offset & (blocksize - 1));
|
length = blocksize - (offset & (blocksize - 1));
|
||||||
|
@ -1779,10 +1778,7 @@ static int ext3_block_truncate_page(handle_t *handle, struct page *page,
|
||||||
*/
|
*/
|
||||||
if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) &&
|
if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) &&
|
||||||
ext3_should_writeback_data(inode) && PageUptodate(page)) {
|
ext3_should_writeback_data(inode) && PageUptodate(page)) {
|
||||||
kaddr = kmap_atomic(page, KM_USER0);
|
zero_user_page(page, offset, length, KM_USER0);
|
||||||
memset(kaddr + offset, 0, length);
|
|
||||||
flush_dcache_page(page);
|
|
||||||
kunmap_atomic(kaddr, KM_USER0);
|
|
||||||
set_page_dirty(page);
|
set_page_dirty(page);
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
|
@ -1835,11 +1831,7 @@ static int ext3_block_truncate_page(handle_t *handle, struct page *page,
|
||||||
goto unlock;
|
goto unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
kaddr = kmap_atomic(page, KM_USER0);
|
zero_user_page(page, offset, length, KM_USER0);
|
||||||
memset(kaddr + offset, 0, length);
|
|
||||||
flush_dcache_page(page);
|
|
||||||
kunmap_atomic(kaddr, KM_USER0);
|
|
||||||
|
|
||||||
BUFFER_TRACE(bh, "zeroed end of block");
|
BUFFER_TRACE(bh, "zeroed end of block");
|
||||||
|
|
||||||
err = 0;
|
err = 0;
|
||||||
|
|
Loading…
Reference in a new issue