From ef5b6c018bb9835df947e73a1fc26d85feccdce4 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Wed, 19 Nov 2008 15:36:36 -0800
Subject: [PATCH] --- yaml --- r: 119192 b: refs/heads/master c:
 bda8550deed96687f29992d711a88ea21cff4d26 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/migrate.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 94d1dac83e91..bd6f843dc28d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 966c8c12dc9e77f931e2281ba25d2f0244b06949
+refs/heads/master: bda8550deed96687f29992d711a88ea21cff4d26
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 385db89f0c33..1e0d6b237f44 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -522,15 +522,12 @@ static int writeout(struct address_space *mapping, struct page *page)
 	remove_migration_ptes(page, page);
 
 	rc = mapping->a_ops->writepage(page, &wbc);
-	if (rc < 0)
-		/* I/O Error writing */
-		return -EIO;
 
 	if (rc != AOP_WRITEPAGE_ACTIVATE)
 		/* unlocked. Relock */
 		lock_page(page);
 
-	return -EAGAIN;
+	return (rc < 0) ? -EIO : -EAGAIN;
 }
 
 /*