From 873918def2a6948e2ba8840c436cf872645b3b73 Mon Sep 17 00:00:00 2001
From: Rik van Riel <riel@redhat.com>
Date: Thu, 13 Jan 2011 15:46:06 -0800
Subject: [PATCH] --- yaml --- r: 230721 b: refs/heads/master c:
 212260aa07135b327752dc02625c68cf4ce04caf h: refs/heads/master i:   230719:
 fdd8e459da20d4511925317e086a53e4e5537ab8 v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/page-flags.h | 2 +-
 trunk/mm/filemap.c               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7810c78009b5..05d761690d92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dabb16f639820267b3850d804571c70bd93d4e07
+refs/heads/master: 212260aa07135b327752dc02625c68cf4ce04caf
diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index 5f38c460367e..4805fdec8d6e 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/include/linux/page-flags.h
@@ -198,7 +198,7 @@ static inline int __TestClearPage##uname(struct page *page) { return 0; }
 struct page;	/* forward declaration */
 
 TESTPAGEFLAG(Locked, locked) TESTSETFLAG(Locked, locked)
-PAGEFLAG(Error, error)
+PAGEFLAG(Error, error) TESTCLEARFLAG(Error, error)
 PAGEFLAG(Referenced, referenced) TESTCLEARFLAG(Referenced, referenced)
 PAGEFLAG(Dirty, dirty) TESTSCFLAG(Dirty, dirty) __CLEARPAGEFLAG(Dirty, dirty)
 PAGEFLAG(LRU, lru) __CLEARPAGEFLAG(LRU, lru)
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 1a3dd5914726..b4ad8e36c81a 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -298,7 +298,7 @@ int filemap_fdatawait_range(struct address_space *mapping, loff_t start_byte,
 				continue;
 
 			wait_on_page_writeback(page);
-			if (PageError(page))
+			if (TestClearPageError(page))
 				ret = -EIO;
 		}
 		pagevec_release(&pvec);