diff options
| author | Andrea Arcangeli <aarcange@redhat.com> | 2015-02-11 15:27:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 17:06:05 -0800 |
| commit | 7e339128496284cc21977fba5416166ee81f5172 (patch) | |
| tree | 6af95386953cc67f3f465b966e03cb56f184dd30 /net/ceph | |
| parent | a7b780750e1a1c7833812681e1f8fa30bbb06802 (diff) | |
| download | op-kernel-dev-7e339128496284cc21977fba5416166ee81f5172.zip op-kernel-dev-7e339128496284cc21977fba5416166ee81f5172.tar.gz | |
mm: gup: use get_user_pages_unlocked
This allows those get_user_pages calls to pass FAULT_FLAG_ALLOW_RETRY to
the page fault in order to release the mmap_sem during the I/O.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andres Lagar-Cavilla <andreslc@google.com>
Cc: Peter Feiner <pfeiner@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/pagevec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c index 5550130..096d914 100644 --- a/net/ceph/pagevec.c +++ b/net/ceph/pagevec.c @@ -23,17 +23,15 @@ struct page **ceph_get_direct_page_vector(const void __user *data, if (!pages) return ERR_PTR(-ENOMEM); - down_read(¤t->mm->mmap_sem); while (got < num_pages) { - rc = get_user_pages(current, current->mm, + rc = get_user_pages_unlocked(current, current->mm, (unsigned long)data + ((unsigned long)got * PAGE_SIZE), - num_pages - got, write_page, 0, pages + got, NULL); + num_pages - got, write_page, 0, pages + got); if (rc < 0) break; BUG_ON(rc == 0); got += rc; } - up_read(¤t->mm->mmap_sem); if (rc < 0) goto fail; return pages; |
