X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=mm%2Fmigrate.c;h=1e0d6b237f4418c2f8b8ca50e88d85a787adc0a7;hb=558073dd56707864f09d563b64e7c37c021e89d2;hp=385db89f0c33e48a421b8adf63e63b60b0e4881e;hpb=0aedadf91a70a11c4a3e7c7d99b21e5528af8d5d;p=linux-2.6-omap-h63xx.git

diff --git a/mm/migrate.c b/mm/migrate.c
index 385db89f0c3..1e0d6b237f4 100644
--- a/mm/migrate.c
+++ b/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;
 }
 
 /*