X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fnfs%2Fread.c;h=cb6f7bfe373b23241b2b6383b8201fda98d39461;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=0de2e2d120154a9cfaafcecb932699945edf69f9;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 0de2e2d12..cb6f7bfe3 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -39,25 +38,11 @@ static void nfs_readpage_result_partial(struct nfs_read_data *, int); static void nfs_readpage_result_full(struct nfs_read_data *, int); static kmem_cache_t *nfs_rdata_cachep; -static mempool_t *nfs_rdata_mempool; +mempool_t *nfs_rdata_mempool; #define MIN_POOL_READ (32) -static struct nfs_read_data *nfs_readdata_alloc(void) -{ - struct nfs_read_data *p; - p = (struct nfs_read_data *)mempool_alloc(nfs_rdata_mempool, SLAB_NOFS); - if (p) - memset(p, 0, sizeof(*p)); - return p; -} - -static __inline__ void nfs_readdata_free(struct nfs_read_data *p) -{ - mempool_free(p, nfs_rdata_mempool); -} - -static void nfs_readdata_release(struct rpc_task *task) +void nfs_readdata_release(struct rpc_task *task) { struct nfs_read_data *data = (struct nfs_read_data *)task->tk_calldata; nfs_readdata_free(data);