From d1ca78ccd05ea224dcd6513d1d8dc834cd11e0c2 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 26 Oct 2010 14:22:27 -0700 Subject: [PATCH] --- yaml --- r: 217515 b: refs/heads/master c: b6777c40c79168d938c30b5b7471fbd64bca109c h: refs/heads/master i: 217513: b349c00a2f36f236f1f6972168113fafd658b152 217511: 2a05f4ba7f4ab05d6337d8f7632dbbce483dd8ab v: v3 --- [refs] | 2 +- trunk/fs/fuse/dev.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3737e1eb58a4..1a2da12fb3dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ecb01df3261d3b1f02ccfcf8384e2a255d2a1d0 +refs/heads/master: b6777c40c79168d938c30b5b7471fbd64bca109c diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c index 69037118b2c9..b98664275f02 100644 --- a/trunk/fs/fuse/dev.c +++ b/trunk/fs/fuse/dev.c @@ -809,11 +809,9 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep, int err; struct page *page = *pagep; - if (page && zeroing && count < PAGE_SIZE) { - void *mapaddr = kmap_atomic(page, KM_USER1); - clear_page(mapaddr); - kunmap_atomic(mapaddr, KM_USER1); - } + if (page && zeroing && count < PAGE_SIZE) + clear_highpage(page); + while (count) { if (cs->write && cs->pipebufs && page) { return fuse_ref_page(cs, page, offset, count); @@ -830,10 +828,10 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep, } } if (page) { - void *mapaddr = kmap_atomic(page, KM_USER1); + void *mapaddr = kmap_atomic(page, KM_USER0); void *buf = mapaddr + offset; offset += fuse_copy_do(cs, &buf, &count); - kunmap_atomic(mapaddr, KM_USER1); + kunmap_atomic(mapaddr, KM_USER0); } else offset += fuse_copy_do(cs, NULL, &count); }