From: Peter Zijlstra <a.p.zijlstra@chello.nl>

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@chello.nl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 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);
 	}
_