Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c11d7a9 authored by Nate Diller's avatar Nate Diller Committed by Linus Torvalds
Browse files

ext3: use zero_user_page 



Use zero_user_page() instead of open-coding it.

Signed-off-by: default avatarNate Diller <nate.diller@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f36dca90

fs/ext3/inode.c

+2 −10
Original line number Diff line number Diff line
@@ -1767,7 +1767,6 @@ static int ext3_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));
@@ -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) &&

	     ext3_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;

	}
@@ -1835,11 +1831,7 @@ static int ext3_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");



	err = 0;