Merge branch 'akpm'

gregkh · gregkh · commit 79fc170b1f5c · 2018-10-13T09:31:19.000+02:00
Fixes from Andrew:

* akpm:
  fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters()
  mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2
  mm/mmap.c: don't clobber partially overlapping VMA with MAP_FIXED_NOREPLACE
  ocfs2: fix a GCC warning
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
@@ -682,6 +682,7 @@ int fat_count_free_clusters(struct super_block *sb)
 			if (ops->ent_get(&fatent) == FAT_ENT_FREE)
 				free++;
 		} while (fat_ent_next(sbi, &fatent));
+		cond_resched();
 	}
 	sbi->free_clusters = free;
 	sbi->free_clus_valid = 1;
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
@@ -96,7 +96,9 @@ struct ocfs2_unblock_ctl {
 };
 
 /* Lockdep class keys */
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
 static struct lock_class_key lockdep_keys[OCFS2_NUM_LOCK_TYPES];
+#endif
 
 static int ocfs2_check_meta_downconvert(struct ocfs2_lock_res *lockres,
 					int new_level);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
@@ -2885,9 +2885,6 @@ void set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,
 	if (!(pvmw->pmd && !pvmw->pte))
 		return;
 
-	mmu_notifier_invalidate_range_start(mm, address,
-			address + HPAGE_PMD_SIZE);
-
 	flush_cache_range(vma, address, address + HPAGE_PMD_SIZE);
 	pmdval = *pvmw->pmd;
 	pmdp_invalidate(vma, address, pvmw->pmd);
@@ -2900,9 +2897,6 @@ void set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,
 	set_pmd_at(mm, address, pvmw->pmd, pmdswp);
 	page_remove_rmap(page, true);
 	put_page(page);
-
-	mmu_notifier_invalidate_range_end(mm, address,
-			address + HPAGE_PMD_SIZE);
 }
 
 void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
diff --git a/mm/mmap.c b/mm/mmap.c
@@ -1410,7 +1410,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 	if (flags & MAP_FIXED_NOREPLACE) {
 		struct vm_area_struct *vma = find_vma(mm, addr);
 
-		if (vma && vma->vm_start <= addr)
+		if (vma && vma->vm_start < addr + len)
 			return -EEXIST;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -682,6 +682,7 @@ int fat_count_free_clusters(struct super_block *sb)`
`682`	`682`	`if (ops->ent_get(&fatent) == FAT_ENT_FREE)`
`683`	`683`	`free++;`
`684`	`684`	`} while (fat_ent_next(sbi, &fatent));`
	`685`	`+ cond_resched();`
`685`	`686`	`}`
`686`	`687`	`sbi->free_clusters = free;`
`687`	`688`	`sbi->free_clus_valid = 1;`
Original file line number	Diff line number	Diff line change
`@@ -1410,7 +1410,7 @@ unsigned long do_mmap(struct file *file, unsigned long addr,`
`1410`	`1410`	`if (flags & MAP_FIXED_NOREPLACE) {`
`1411`	`1411`	`struct vm_area_struct *vma = find_vma(mm, addr);`
`1412`	`1412`
`1413`		`- if (vma && vma->vm_start <= addr)`
	`1413`	`+ if (vma && vma->vm_start < addr + len)`
`1414`	`1414`	`return -EEXIST;`
`1415`	`1415`	`}`
`1416`	`1416`