From 3fb144ea7156b1a8e9108ea0c2a59fe8aab456d5 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 19 Oct 2011 12:17:29 -0700 Subject: [PATCH] --- yaml --- r: 267227 b: refs/heads/master c: fbb5a9abf0d589e9471dc93b18025b7b921d22c9 h: refs/heads/master i: 267225: ad41d8df848994add1b2aa67d8452b7733674a49 267223: fd3ea4478f876278c807f32becae34c8e7bb26d1 v: v3 --- [refs] | 2 +- trunk/fs/nfs/read.c | 2 -- trunk/fs/nfs/write.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eed00a59ca02..4b3b5a6cc9d9 100644 --- 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 index e866a7e6e2d5..09829d96d207 100644 --- 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 index ad90b0c998cb..2219c88d96b2 100644 --- 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);