diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-10-19 15:17:29 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-10-19 16:58:37 -0400 |
commit | fbb5a9abf0d589e9471dc93b18025b7b921d22c9 (patch) | |
tree | 0f9ad68b242159289fd57b39dddd5fb4da7ea708 | |
parent | d00c5d43866720963a265fa3129f3203cac35b8e (diff) |
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>
-rw-r--r-- | fs/nfs/read.c | 2 | ||||
-rw-r--r-- | fs/nfs/write.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index e866a7e6e2d5..09829d96d207 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 | |||
322 | offset += len; | 322 | offset += len; |
323 | } while(nbytes != 0); | 323 | } while(nbytes != 0); |
324 | atomic_set(&req->wb_complete, requests); | 324 | atomic_set(&req->wb_complete, requests); |
325 | ClearPageError(page); | ||
326 | desc->pg_rpc_callops = &nfs_read_partial_ops; | 325 | desc->pg_rpc_callops = &nfs_read_partial_ops; |
327 | return ret; | 326 | return ret; |
328 | out_bad: | 327 | out_bad: |
@@ -357,7 +356,6 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc, struct list_head * | |||
357 | req = nfs_list_entry(head->next); | 356 | req = nfs_list_entry(head->next); |
358 | nfs_list_remove_request(req); | 357 | nfs_list_remove_request(req); |
359 | nfs_list_add_request(req, &data->pages); | 358 | nfs_list_add_request(req, &data->pages); |
360 | ClearPageError(req->wb_page); | ||
361 | *pages++ = req->wb_page; | 359 | *pages++ = req->wb_page; |
362 | } | 360 | } |
363 | req = nfs_list_entry(data->pages.next); | 361 | req = nfs_list_entry(data->pages.next); |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index ad90b0c998cb..2219c88d96b2 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 | |||
1011 | req = nfs_list_entry(head->next); | 1011 | req = nfs_list_entry(head->next); |
1012 | nfs_list_remove_request(req); | 1012 | nfs_list_remove_request(req); |
1013 | nfs_list_add_request(req, &data->pages); | 1013 | nfs_list_add_request(req, &data->pages); |
1014 | ClearPageError(req->wb_page); | ||
1015 | *pages++ = req->wb_page; | 1014 | *pages++ = req->wb_page; |
1016 | } | 1015 | } |
1017 | req = nfs_list_entry(data->pages.next); | 1016 | req = nfs_list_entry(data->pages.next); |