---

yaml --- r: 199424 b: refs/heads/master c: 1bf94ca h: refs/heads/master v: v3
git-mirror · May 25, 2010 · ab3ce2a · ab3ce2a
1 parent d047568
commit ab3ce2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aa0edd294f69e3100973a0ecfa1e6b5ab42d83a
+refs/heads/master: 1bf94ca73ea524228b864275efa44373ebb939a0
diff --git a/trunk/fs/fuse/dev.c b/trunk/fs/fuse/dev.c
@@ -551,10 +551,7 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
 		cs->iov++;
 		cs->nr_segs--;
 	}
-	down_read(&current->mm->mmap_sem);
-	err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0,
-			     &cs->pg, NULL);
-	up_read(&current->mm->mmap_sem);
+	err = get_user_pages_fast(cs->addr, 1, cs->write, &cs->pg);
 	if (err < 0)
 		return err;
 	BUG_ON(err != 1);

diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
@@ -994,10 +994,7 @@ static int fuse_get_user_pages(struct fuse_req *req, const char __user *buf,
 	nbytes = min_t(size_t, nbytes, FUSE_MAX_PAGES_PER_REQ << PAGE_SHIFT);
 	npages = (nbytes + offset + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	npages = clamp(npages, 1, FUSE_MAX_PAGES_PER_REQ);
-	down_read(&current->mm->mmap_sem);
-	npages = get_user_pages(current, current->mm, user_addr, npages, !write,
-				0, req->pages, NULL);
-	up_read(&current->mm->mmap_sem);
+	npages = get_user_pages_fast(user_addr, npages, !write, req->pages);
 	if (npages < 0)
 		return npages;