1 files changed, 4 insertions, 0 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index fc2ccf79a776..d38d7e61fcd0 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1477,12 +1477,16 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user)
                 if (!user_shm_lock(inode->i_size, user))
                         goto out_nomem;
                 info->flags |= VM_LOCKED;
+                mapping_set_unevictable(file->f_mapping);
         }
         if (!lock && (info->flags & VM_LOCKED) && user) {
                 user_shm_unlock(inode->i_size, user);
                 info->flags &= ~VM_LOCKED;
+                mapping_clear_unevictable(file->f_mapping);
+                scan_mapping_unevictable_pages(file->f_mapping);
         }
         retval = 0;
+
 out_nomem:
         spin_unlock(&info->lock);
         return retval;