cris: switch to get_user_pages_fast()

[sfrench/cifs-2.6.git] / arch / cris / arch-v32 / drivers / cryptocop.c

diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c
index d688fe117dca6806404e8ff445f7b2d64c6889d1..a3c353472a8cb7ceaa347527a94e4576e67edc65 100644 (file)
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
@@ -2717,37 +2717,28 @@ static int cryptocop_ioctl_process(struct inode *inode, struct file *filp, unsig
                }
        }
 
-       /* Acquire the mm page semaphore. */
-       down_read(&current->mm->mmap_sem);
-
-       err = get_user_pages((unsigned long int)(oper.indata + prev_ix),
+       err = get_user_pages_fast((unsigned long)(oper.indata + prev_ix),
                             noinpages,
-                            0,  /* read access only for in data */
-                            inpages,
-                            NULL);
+                            false,  /* read access only for in data */
+                            inpages);
 
        if (err < 0) {
-               up_read(&current->mm->mmap_sem);
                nooutpages = noinpages = 0;
                DEBUG_API(printk("cryptocop_ioctl_process: get_user_pages indata\n"));
                goto error_cleanup;
        }
        noinpages = err;
-       if (oper.do_cipher){
-               err = get_user_pages((unsigned long int)oper.cipher_outdata,
+       if (oper.do_cipher) {
+               err = get_user_pages_fast((unsigned long)oper.cipher_outdata,
                                     nooutpages,
-                                    FOLL_WRITE, /* write access for out data */
-                                    outpages,
-                                    NULL);
-               up_read(&current->mm->mmap_sem);
+                                    true, /* write access for out data */
+                                    outpages);
                if (err < 0) {
                        nooutpages = 0;
                        DEBUG_API(printk("cryptocop_ioctl_process: get_user_pages outdata\n"));
                        goto error_cleanup;
                }
                nooutpages = err;
-       } else {
-               up_read(&current->mm->mmap_sem);
        }
 
        /* Add 6 to nooutpages to make room for possibly inserted buffers for storing digest and