NFS: Get rid of unnecessary calls to ClearPageError() in read code

The generic file read code does that for us anyway.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index e866a7e6e2d593be073df0a6d382a8212caf0c2c..09829d96d207f4f597db6e941c3ab559eed6c222 100644 (file)
--- a/fs/nfs/read.c
+++ b/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/fs/nfs/write.c b/fs/nfs/write.c
index ad90b0c998cbad942aefa7245781f241aa0831d2..2219c88d96b274004a7e40afc7ed5053dec20028 100644 (file)
--- a/fs/nfs/write.c
+++ b/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);