From 238c9bfa6b7e515a60a7a1cf74069a4479eaec82 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 15 Dec 2012 17:12:14 -0500
Subject: [PATCH] --- yaml --- r: 346638 b: refs/heads/master c:
 ada8e20d044c0fa5610e504ce6fb4578ebd3edd9 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/write.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4a94f9e7dbd7..76ecf379329c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1efc28780bf84f04dcce4f3f7242e4e6a59bffd4
+refs/heads/master: ada8e20d044c0fa5610e504ce6fb4578ebd3edd9
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index f608ca606b2b..5209916e1222 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -202,7 +202,6 @@ static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int c
 /* A writeback failed: mark the page as bad, and invalidate the page cache */
 static void nfs_set_pageerror(struct page *page)
 {
-	SetPageError(page);
 	nfs_zap_mapping(page_file_mapping(page)->host, page_file_mapping(page));
 }