1 files changed, 2 insertions, 4 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index ea26d7a0342d..0e10b06fc7d6 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -756,7 +756,7 @@ void shmem_unlock_mapping(struct address_space *mapping)
                         break;
                 index = indices[pvec.nr - 1] + 1;
                 pagevec_remove_exceptionals(&pvec);
-                check_move_unevictable_pages(pvec.pages, pvec.nr);
+                check_move_unevictable_pages(&pvec);
                 pagevec_release(&pvec);
                 cond_resched();
         }
@@ -2563,9 +2563,7 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence)
         inode_lock(inode);
         /* We're holding i_mutex so we can access i_size directly */
 
-        if (offset < 0)
-                offset = -EINVAL;
-        else if (offset >= inode->i_size)
+        if (offset < 0 || offset >= inode->i_size)
                 offset = -ENXIO;
         else {
                 start = offset >> PAGE_SHIFT;