diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2007-07-18 09:20:44 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-07-18 09:20:44 -0400 |
| commit | fc0e15a667121e02686cc52679f6272959fb60cc (patch) | |
| tree | 1390b806b6286166f486e03726de32c47c3811fa /fs/ext4 | |
| parent | f8628a14a27eb4512a1ede43de1d9db4d9f92bc3 (diff) | |
| download | linux-stable-fc0e15a667121e02686cc52679f6272959fb60cc.tar.gz linux-stable-fc0e15a667121e02686cc52679f6272959fb60cc.tar.bz2 linux-stable-fc0e15a667121e02686cc52679f6272959fb60cc.zip | |
Use zero_user_page() in ext4 where possible
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index f6d8528c4f55..125aca714685 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1766,7 +1766,6 @@ int ext4_block_truncate_page(handle_t *handle, struct page *page, struct inode *inode = mapping->host; struct buffer_head *bh; int err = 0; - void *kaddr; blocksize = inode->i_sb->s_blocksize; length = blocksize - (offset & (blocksize - 1)); @@ -1778,10 +1777,7 @@ int ext4_block_truncate_page(handle_t *handle, struct page *page, */ if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) && ext4_should_writeback_data(inode) && PageUptodate(page)) { - kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr + offset, 0, length); - flush_dcache_page(page); - kunmap_atomic(kaddr, KM_USER0); + zero_user_page(page, offset, length, KM_USER0); set_page_dirty(page); goto unlock; } @@ -1834,10 +1830,7 @@ int ext4_block_truncate_page(handle_t *handle, struct page *page, goto unlock; } - kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr + offset, 0, length); - flush_dcache_page(page); - kunmap_atomic(kaddr, KM_USER0); + zero_user_page(page, offset, length, KM_USER0); BUFFER_TRACE(bh, "zeroed end of block"); |