Skip to content

Commit 369f267

Browse files
lorenzo-stoakestorvalds
authored andcommitted
rapidio: use get_user_pages_unlocked()
Moving from get_user_pages() to get_user_pages_unlocked() simplifies the code and takes advantage of VM_FAULT_RETRY functionality when faulting in pages. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Lorenzo Stoakes <[email protected]> Acked-by: Alexandre Bounine <[email protected]> Cc: Matt Porter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4649201 commit 369f267

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

drivers/rapidio/devices/rio_mport_cdev.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -889,17 +889,16 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
889889
goto err_req;
890890
}
891891

892-
down_read(&current->mm->mmap_sem);
893-
pinned = get_user_pages(
892+
pinned = get_user_pages_unlocked(
894893
(unsigned long)xfer->loc_addr & PAGE_MASK,
895894
nr_pages,
896-
dir == DMA_FROM_DEVICE ? FOLL_WRITE : 0,
897-
page_list, NULL);
898-
up_read(&current->mm->mmap_sem);
895+
page_list,
896+
dir == DMA_FROM_DEVICE ? FOLL_WRITE : 0);
899897

900898
if (pinned != nr_pages) {
901899
if (pinned < 0) {
902-
rmcd_error("get_user_pages err=%ld", pinned);
900+
rmcd_error("get_user_pages_unlocked err=%ld",
901+
pinned);
903902
nr_pages = 0;
904903
} else
905904
rmcd_error("pinned %ld out of %ld pages",

0 commit comments

Comments
 (0)