The patch titled
Subject: swap: redirty page if page write fails on swap file
has been removed from the -mm tree. Its filename was
swap-redirty-page-if-page-write-fails-on-swap-file.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jerome Marchand <jmarchan@xxxxxxxxxx>
Subject: swap: redirty page if page write fails on swap file
Since 62c230b ("mm: add support for a filesystem to activate swap files
and use direct_IO for writing swap pages"), swap_writepage() calls
direct_IO on swap files. However, in that case the page isn't redirtied
if I/O fails, and is therefore handled afterwards as if it has been
successfully written to the swap file, leading to memory corruption when
the page is eventually swapped back in.
This patch sets the page dirty when direct_IO() fails. It fixes a memory
corruption that happened while using swap-over-NFS.
Signed-off-by: Jerome Marchand <jmarchan@xxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Acked-by: Mel Gorman <mgorman@xxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [3.6+]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_io.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/page_io.c~swap-redirty-page-if-page-write-fails-on-swap-file mm/page_io.c
--- a/mm/page_io.c~swap-redirty-page-if-page-write-fails-on-swap-file
+++ a/mm/page_io.c
@@ -231,6 +231,8 @@ int __swap_writepage(struct page *page,
if (ret == PAGE_SIZE) {
count_vm_event(PSWPOUT);
ret = 0;
+ } else {
+ set_page_dirty(page);
}
return ret;
}
_
Patches currently in -mm which might be from jmarchan@xxxxxxxxxx are
origin.patch
inotify-invalid-mask-should-return-a-error-number-but-not-set-it.patch
inotify-invalid-mask-should-return-a-error-number-but-not-set-it-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html