Merge "mm: vmscan: lock page on swap error in pageout"
diff --git a/mm/vmscan.c b/mm/vmscan.c
index d0e40e5..e2e43aa 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -474,8 +474,18 @@
if (!PageWriteback(page)) {
/* synchronous write or broken a_ops? */
ClearPageReclaim(page);
- if (PageError(page))
+ if (PageError(page) && PageSwapCache(page)) {
+ ClearPageError(page);
+ /*
+ * We lock the page here because it is required
+ * to free the swp space later in
+ * shrink_page_list. But the page may be
+ * unclocked by functions like
+ * handle_write_error.
+ */
+ __set_page_locked(page);
return PAGE_ACTIVATE;
+ }
}
trace_mm_vmscan_writepage(page, trace_reclaim_flags(page));
inc_zone_page_state(page, NR_VMSCAN_WRITE);