Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 54c57dc3b6578356c0a428c767d4bf080254a2ee

Authored by Eric Sandeen
Committed by Mark Fasheh
1 parent b25801038d

[PATCH] ocfs2: zero_user_page conversion 

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

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

... ... @@ -740,18 +740,13 @@
740 740 bh = head;
741 741 block_start = 0;
742 742 do {
743   - void *kaddr;
744   -
745 743 block_end = block_start + bsize;
746 744 if (block_end <= from)
747 745 goto next_bh;
748 746 if (block_start >= to)
749 747 break;
750 748  
751   - kaddr = kmap_atomic(page, KM_USER0);
752   - memset(kaddr+block_start, 0, bh->b_size);
753   - flush_dcache_page(page);
754   - kunmap_atomic(kaddr, KM_USER0);
  749 + zero_user_page(page, block_start, bh->b_size, KM_USER0);
755 750 set_buffer_uptodate(bh);
756 751 mark_buffer_dirty(bh);
757 752  
758 753  
... ... @@ -906,15 +901,11 @@
906 901 if (block_end > from && block_start < to) {
907 902 if (!PageUptodate(page)) {
908 903 unsigned start, end;
909   - void *kaddr;
910 904  
911 905 start = max(from, block_start);
912 906 end = min(to, block_end);
913 907  
914   - kaddr = kmap_atomic(page, KM_USER0);
915   - memset(kaddr+start, 0, end - start);
916   - flush_dcache_page(page);
917   - kunmap_atomic(kaddr, KM_USER0);
  908 + zero_user_page(page, start, end - start, KM_USER0);
918 909 set_buffer_uptodate(bh);
919 910 }
920 911