summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-13 09:31:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-13 09:31:19 +0200
commit79fc170b1f5c36f486d886bfbd59eb4e62321128 (patch)
treecb16b5f0a0b4f96e86301c061021d0ba5ea78c00 /fs
parentcafa017dc5df8abc38308fedae3f1bd7ff67802d (diff)
parentac081c3be3fae6d0cc3e1862507fca3862d30b67 (diff)
downloadlinux-79fc170b1f5c36f486d886bfbd59eb4e62321128.tar.bz2
Merge branch 'akpm'
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
Diffstat (limited to 'fs')
-rw-r--r--fs/fat/fatent.c1
-rw-r--r--fs/ocfs2/dlmglue.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index defc2168de91..f58c0cacc531 100644
--- 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
index 8e712b614e6e..933aac5da193 100644
--- 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);