From ab3ce2aabdf4e6ec5dbcb2083365681f8e204757 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 25 May 2010 15:06:06 +0200 Subject: [PATCH] --- yaml --- r: 199424 b: refs/heads/master c: 1bf94ca73ea524228b864275efa44373ebb939a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/fuse/dev.c | 5 +---- trunk/fs/fuse/file.c | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 79bbfaf43cd6..3e84b3d3e7aa 100644 --- 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 index eb7e9423691f..4623018e104a 100644 --- 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(¤t->mm->mmap_sem); - err = get_user_pages(current, current->mm, cs->addr, 1, cs->write, 0, - &cs->pg, NULL); - up_read(¤t->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 index 4172bfee0f1a..29bda0564e69 100644 --- 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(¤t->mm->mmap_sem); - npages = get_user_pages(current, current->mm, user_addr, npages, !write, - 0, req->pages, NULL); - up_read(¤t->mm->mmap_sem); + npages = get_user_pages_fast(user_addr, npages, !write, req->pages); if (npages < 0) return npages;