1 files changed, 8 insertions, 22 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 2171c043ab08..cfa175c223dc 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -35,16 +35,13 @@ static const struct rpc_call_ops nfs_read_partial_ops;
 static const struct rpc_call_ops nfs_read_full_ops;
 
 static struct kmem_cache *nfs_rdata_cachep;
-static mempool_t *nfs_rdata_mempool;
-
-#define MIN_POOL_READ   (32)
 
 struct nfs_read_data *nfs_readdata_alloc(unsigned int pagecount)
 {
-        struct nfs_read_data *p = mempool_alloc(nfs_rdata_mempool, GFP_KERNEL);
+        struct nfs_read_data *p;
 
+        p = kmem_cache_zalloc(nfs_rdata_cachep, GFP_KERNEL);
         if (p) {
-                memset(p, 0, sizeof(*p));
                 INIT_LIST_HEAD(&p->pages);
                 p->npages = pagecount;
                 if (pagecount <= ARRAY_SIZE(p->page_array))
@@ -52,7 +49,7 @@ struct nfs_read_data *nfs_readdata_alloc(unsigned int pagecount)
                 else {
                         p->pagevec = kcalloc(pagecount, sizeof(struct page *), GFP_KERNEL);
                         if (!p->pagevec) {
-                                mempool_free(p, nfs_rdata_mempool);
+                                kmem_cache_free(nfs_rdata_cachep, p);
                                 p = NULL;
                         }
                 }
@@ -64,7 +61,7 @@ void nfs_readdata_free(struct nfs_read_data *p)
 {
         if (p && (p->pagevec != &p->page_array[0]))
                 kfree(p->pagevec);
-        mempool_free(p, nfs_rdata_mempool);
+        kmem_cache_free(nfs_rdata_cachep, p);
 }
 
 void nfs_readdata_release(struct nfs_read_data *rdata)
@@ -112,7 +109,7 @@ static void nfs_readpage_truncate_uninitialised_page(struct nfs_read_data *data)
         }
 }
 
-static void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,
+void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,
                 struct inode *inode)
 {
         nfs_pageio_init(pgio, inode, &nfs_pageio_read_ops,
@@ -276,7 +273,6 @@ nfs_async_read_error(struct list_head *head)
         while (!list_empty(head)) {
                 req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
-                SetPageError(req->wb_page);
                 nfs_readpage_release(req);
         }
 }
@@ -322,7 +318,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:
@@ -331,7 +326,6 @@ out_bad:
                 list_del(&data->list);
                 nfs_readdata_free(data);
         }
-        SetPageError(page);
         nfs_readpage_release(req);
         return -ENOMEM;
 }
@@ -357,7 +351,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);
@@ -435,7 +428,7 @@ static void nfs_readpage_retry(struct rpc_task *task, struct nfs_read_data *data
         argp->offset += resp->count;
         argp->pgbase += resp->count;
         argp->count -= resp->count;
-        nfs_restart_rpc(task, NFS_SERVER(data->inode)->nfs_client);
+        rpc_restart_call_prepare(task);
 }
 
 /*
@@ -462,10 +455,10 @@ static void nfs_readpage_release_partial(void *calldata)
         int status = data->task.tk_status;
 
         if (status < 0)
-                SetPageError(page);
+                set_bit(PG_PARTIAL_READ_FAILED, &req->wb_flags);
 
         if (atomic_dec_and_test(&req->wb_complete)) {
-                if (!PageError(page))
+                if (!test_bit(PG_PARTIAL_READ_FAILED, &req->wb_flags))
                         SetPageUptodate(page);
                 nfs_readpage_release(req);
         }
@@ -648,7 +641,6 @@ readpage_async_filler(void *data, struct page *page)
         return 0;
 out_error:
         error = PTR_ERR(new);
-        SetPageError(page);
 out_unlock:
         unlock_page(page);
         return error;
@@ -711,16 +703,10 @@ int __init nfs_init_readpagecache(void)
         if (nfs_rdata_cachep == NULL)
                 return -ENOMEM;
 
-        nfs_rdata_mempool = mempool_create_slab_pool(MIN_POOL_READ,
-                                                     nfs_rdata_cachep);
-        if (nfs_rdata_mempool == NULL)
-                return -ENOMEM;
-
         return 0;
 }
 
 void nfs_destroy_readpagecache(void)
 {
-        mempool_destroy(nfs_rdata_mempool);
         kmem_cache_destroy(nfs_rdata_cachep);
 }