---

yaml --- r: 267227 b: refs/heads/master c: fbb5a9a h: refs/heads/master i: 267225: ad41d8d 267223: fd3ea44 v: v3
git-mirror · Oct 19, 2011 · 3fb144e · 3fb144e
1 parent 5d1d755
commit 3fb144e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d00c5d43866720963a265fa3129f3203cac35b8e
+refs/heads/master: fbb5a9abf0d589e9471dc93b18025b7b921d22c9
diff --git a/trunk/fs/nfs/read.c b/trunk/fs/nfs/read.c
@@ -322,7 +322,6 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc, struct list_head
 		offset += len;
 	} while(nbytes != 0);
 	atomic_set(&req->wb_complete, requests);
-	ClearPageError(page);
 	desc->pg_rpc_callops = &nfs_read_partial_ops;
 	return ret;
 out_bad:
@@ -357,7 +356,6 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc, struct list_head *
 		req = nfs_list_entry(head->next);
 		nfs_list_remove_request(req);
 		nfs_list_add_request(req, &data->pages);
-		ClearPageError(req->wb_page);
 		*pages++ = req->wb_page;
 	}
 	req = nfs_list_entry(data->pages.next);

diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
@@ -1011,7 +1011,6 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc, struct list_head *r
 		req = nfs_list_entry(head->next);
 		nfs_list_remove_request(req);
 		nfs_list_add_request(req, &data->pages);
-		ClearPageError(req->wb_page);
 		*pages++ = req->wb_page;
 	}
 	req = nfs_list_entry(data->pages.next);