Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux-2.6-block.git] / drivers / scsi / st.c

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 128d3b55bdd9fcc086606605bd787bc7e7ef2a6a..9a1c34205254f62b0f9e1c99d99db3eb29852ce7 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4551,18 +4551,15 @@ static int sgl_map_user_pages(struct st_buffer *STbp,
                return -ENOMEM;
 
         /* Try to fault in all of the necessary pages */
-       down_read(&current->mm->mmap_sem);
         /* rw==READ means read from drive, write into memory area */
-       res = get_user_pages(
+       res = get_user_pages_unlocked(
                current,
                current->mm,
                uaddr,
                nr_pages,
                rw == READ,
                0, /* don't force */
-               pages,
-               NULL);
-       up_read(&current->mm->mmap_sem);
+               pages);
 
        /* Errors and no page mapped should return here */
        if (res < nr_pages)