Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-01-11 14:43:20 +0100
committerPetr Tesarik <ptesarik@suse.cz>2019-01-11 14:43:20 +0100
commit55ae94187b23d2f82f8851a6e239c0f993058fc1 (patch)
tree0e8be5c575a54a880607534f794dca57f25ca719
parentc35779ecc1e88eb1b518e5a130d0381c143053d8 (diff)
parenta526ecfc9f7faecc9212c0780f6915fffa31243b (diff)
Merge branch 'users/mgorman/SLE15-SP1/for-next' into SLE15-SP1
Pull a mm fix from Mel Gorman suse-commit: 5438954647c61663734d3bd467818c80138483a3
-rw-r--r--mm/filemap.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 162c940910d4..8c42cebe54d3 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2639,6 +2639,13 @@ repeat:
}
head = compound_head(page);
+
+ /*
+ * Check for a locked page first, as a speculative
+ * reference may adversely influence page migration.
+ */
+ if (PageLocked(head))
+ goto next;
if (!page_cache_get_speculative(head))
goto repeat;