Merge tag 'block-5.8-2020-07-05' of git://git.kernel.dk/linux-block

[mirror_ubuntu-hirsute-kernel.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index ea95a3e46fbbf3a0af22da95660906d7c0f80a58..a0dbe62f8042e751508d7eb0eee392089cb5a787 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -82,7 +82,6 @@ static struct vfsmount *shm_mnt;
 #include <linux/uuid.h>
 
 #include <linux/uaccess.h>
-#include <asm/pgtable.h>
 
 #include "internal.h"
 
@@ -2320,7 +2319,7 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,
                                             PAGE_SIZE);
                        kunmap_atomic(page_kaddr);
 
-                       /* fallback to copy_from_user outside mmap_sem */
+                       /* fallback to copy_from_user outside mmap_lock */
                        if (unlikely(ret)) {
                                *pagep = page;
                                shmem_inode_unacct_blocks(inode, 1);
@@ -4137,7 +4136,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
        loff_t size = vma->vm_end - vma->vm_start;
 
        /*
-        * Cloning a new file under mmap_sem leads to a lock ordering conflict
+        * Cloning a new file under mmap_lock leads to a lock ordering conflict
         * between XFS directory reading and selinux: since this file is only
         * accessible to the user through its mapping, use S_PRIVATE flag to
         * bypass file security, in the same way as shmem_kernel_file_setup().