From fbb5a9abf0d589e9471dc93b18025b7b921d22c9 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 19 Oct 2011 12:17:29 -0700 Subject: [PATCH] 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 --- fs/nfs/read.c | 2 -- fs/nfs/write.c | 1 - 2 files changed, 3 deletions(-) diff --git a/fs/nfs/read.c b/fs/nfs/read.c index e866a7e6e2d..09829d96d20 100644 --- 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 ad90b0c998c..2219c88d96b 100644 --- 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);