diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 12:38:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 12:38:51 -0800 |
| commit | a0e136e5da98f10ecb41a673374a04102af45e2b (patch) | |
| tree | 05cb9275d1f8290f2750a9d4ec211d7d3b367228 /drivers/scsi | |
| parent | 16382e17c0ff583df2d5eed56ca7c771d637e9d1 (diff) | |
| parent | 77478715ba9242017976fd01de189e77fa072f51 (diff) | |
Merge branch 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull get_user_pages_fast() conversion from Al Viro:
"A bunch of places switched to get_user_pages_fast()"
* 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ceph: use get_user_pages_fast()
pvr2fs: use get_user_pages_fast()
atomisp: use get_user_pages_fast()
st: use get_user_pages_fast()
via_dmablit(): use get_user_pages_fast()
fsl_hypervisor: switch to get_user_pages_fast()
rapidio: switch to get_user_pages_fast()
vchiq_2835_arm: switch to get_user_pages_fast()
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/st.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 94e402ed30f6..b141d7641a2e 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -4920,11 +4920,7 @@ static int sgl_map_user_pages(struct st_buffer *STbp, /* Try to fault in all of the necessary pages */ /* rw==READ means read from drive, write into memory area */ - res = get_user_pages_unlocked( - uaddr, - nr_pages, - pages, - rw == READ ? FOLL_WRITE : 0); /* don't force */ + res = get_user_pages_fast(uaddr, nr_pages, rw == READ, pages); /* Errors and no page mapped should return here */ if (res < nr_pages) |