NFS: Get rid of unnecessary calls to ClearPageError() in read code
Trond Myklebust [Wed, 19 Oct 2011 19:17:29 +0000 (12:17 -0700)]
The generic file read code does that for us anyway.

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

fs/nfs/read.c
fs/nfs/write.c

index e866a7e..09829d9 100644 (file)
@@ -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);
index ad90b0c..2219c88 100644 (file)
@@ -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);