Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0c11d7a9e9e9793219baf715048c190a84bead57

Authored by Nate Diller
Committed by Linus Torvalds
1 parent f36dca90e6
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 2 additions and 10 deletions Side-by-side Diff

... ... @@ -1767,7 +1767,6 @@
1767 1767 struct inode *inode = mapping->host;
1768 1768 struct buffer_head *bh;
1769 1769 int err = 0;
1770   - void *kaddr;
1771 1770  
1772 1771 blocksize = inode->i_sb->s_blocksize;
1773 1772 length = blocksize - (offset & (blocksize - 1));
... ... @@ -1779,10 +1778,7 @@
1779 1778 */
1780 1779 if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) &&
1781 1780 ext3_should_writeback_data(inode) && PageUptodate(page)) {
1782   - kaddr = kmap_atomic(page, KM_USER0);
1783   - memset(kaddr + offset, 0, length);
1784   - flush_dcache_page(page);
1785   - kunmap_atomic(kaddr, KM_USER0);
  1781 + zero_user_page(page, offset, length, KM_USER0);
1786 1782 set_page_dirty(page);
1787 1783 goto unlock;
1788 1784 }
... ... @@ -1835,11 +1831,7 @@
1835 1831 goto unlock;
1836 1832 }
1837 1833  
1838   - kaddr = kmap_atomic(page, KM_USER0);
1839   - memset(kaddr + offset, 0, length);
1840   - flush_dcache_page(page);
1841   - kunmap_atomic(kaddr, KM_USER0);
1842   -
  1834 + zero_user_page(page, offset, length, KM_USER0);
1843 1835 BUFFER_TRACE(bh, "zeroed end of block");
1844 1836  
1845 1837 err = 0;