Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b6777c40c79168d938c30b5b7471fbd64bca109c

Authored by Miklos Szeredi
Committed by Linus Torvalds
1 parent 3ecb01df32
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

fuse: use clear_highpage() and KM_USER0 instead of KM_USER1 

Commit 7909b1c640 ("fuse: don't use atomic kmap") removed KM_USER0 usage
from fuse/dev.c.  Switch KM_USER1 uses to KM_USER0 for clarity.  Also
replace open coded clear_highpage().

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 7 deletions Side-by-side Diff

... ... @@ -809,11 +809,9 @@
809 809 int err;
810 810 struct page *page = *pagep;
811 811  
812   - if (page && zeroing && count < PAGE_SIZE) {
813   - void *mapaddr = kmap_atomic(page, KM_USER1);
814   - clear_page(mapaddr);
815   - kunmap_atomic(mapaddr, KM_USER1);
816   - }
  812 + if (page && zeroing && count < PAGE_SIZE)
  813 + clear_highpage(page);
  814 +
817 815 while (count) {
818 816 if (cs->write && cs->pipebufs && page) {
819 817 return fuse_ref_page(cs, page, offset, count);
820 818  
... ... @@ -830,10 +828,10 @@
830 828 }
831 829 }
832 830 if (page) {
833   - void *mapaddr = kmap_atomic(page, KM_USER1);
  831 + void *mapaddr = kmap_atomic(page, KM_USER0);
834 832 void *buf = mapaddr + offset;
835 833 offset += fuse_copy_do(cs, &buf, &count);
836   - kunmap_atomic(mapaddr, KM_USER1);
  834 + kunmap_atomic(mapaddr, KM_USER0);
837 835 } else
838 836 offset += fuse_copy_do(cs, NULL, &count);
839 837 }