The patch titled
mm: swap failure update
has been removed from the -mm tree. Its filename is
mm-swap-write-failure-fixup-update.patch
This patch was dropped because it was folded into mm-swap-write-failure-fixup.patch
------------------------------------------------------
Subject: mm: swap failure update
From: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Update the error message on write-failure to also print the bio->bi_sector.
And insert an equivalent message on the read-failure path.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/page_io.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff -puN mm/page_io.c~mm-swap-write-failure-fixup-update mm/page_io.c
--- a/mm/page_io.c~mm-swap-write-failure-fixup-update
+++ a/mm/page_io.c
@@ -63,9 +63,10 @@ static int end_swap_bio_write(struct bio
* Also clear PG_reclaim to avoid rotate_reclaimable_page()
*/
set_page_dirty(page);
- printk(KERN_ALERT "Write-error on swap-device (%d:%d)\n",
+ printk(KERN_ALERT "Write-error on swap-device (%u:%u:%Lu)\n",
imajor(bio->bi_bdev->bd_inode),
- iminor(bio->bi_bdev->bd_inode));
+ iminor(bio->bi_bdev->bd_inode),
+ bio->bi_sector);
ClearPageReclaim(page);
}
end_page_writeback(page);
@@ -84,6 +85,10 @@ static int end_swap_bio_read(struct bio
if (!uptodate) {
SetPageError(page);
ClearPageUptodate(page);
+ printk(KERN_ALERT "Read-error on swap-device (%u:%u:%Lu)\n",
+ imajor(bio->bi_bdev->bd_inode),
+ iminor(bio->bi_bdev->bd_inode),
+ bio->bi_sector);
} else {
SetPageUptodate(page);
}
_
Patches currently in -mm which might be from a.p.zijlstra@xxxxxxxxx are
origin.patch
mm-tracking-shared-dirty-pages.patch
mm-balance-dirty-pages.patch
mm-optimize-the-new-mprotect-code-a-bit.patch
mm-small-cleanup-of-install_page.patch
mm-fixup-do_wp_page.patch
mm-msync-cleanup.patch
mm-swap-write-failure-fixup.patch
mm-swap-write-failure-fixup-update.patch
mm-swap-write-failure-fixup-fix.patch
block_devc-mutex_lock_nested-fix.patch
remove-the-old-bd_mutex-lockdep-annotation.patch
new-bd_mutex-lockdep-annotation.patch
nfsd-lockdep-annotation.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
