#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/pagemap.h>
-#include <linux/mempool.h>
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
#include <linux/nfs_page.h>
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 __inline__ 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));
- INIT_LIST_HEAD(&p->pages);
- }
- 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);
/*
* Read a page synchronously.
*/
-static int
-nfs_readpage_sync(struct file *file, struct inode *inode, struct page *page)
+static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode,
+ struct page *page)
{
unsigned int rsize = NFS_SERVER(inode)->rsize;
unsigned int count = PAGE_CACHE_SIZE;
int result;
- struct nfs_read_data rdata = {
- .flags = (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0),
- .cred = NULL,
- .inode = inode,
- .args = {
- .fh = NFS_FH(inode),
- .lockowner = current->files,
- .pages = &page,
- .pgbase = 0UL,
- .count = rsize,
- },
- .res = {
- .fattr = &rdata.fattr,
- }
- };
+ struct nfs_read_data *rdata;
+
+ rdata = nfs_readdata_alloc();
+ if (!rdata)
+ return -ENOMEM;
+
+ memset(rdata, 0, sizeof(*rdata));
+ rdata->flags = (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0);
+ rdata->cred = ctx->cred;
+ rdata->inode = inode;
+ INIT_LIST_HEAD(&rdata->pages);
+ rdata->args.fh = NFS_FH(inode);
+ rdata->args.context = ctx;
+ rdata->args.pages = &page;
+ rdata->args.pgbase = 0UL;
+ rdata->args.count = rsize;
+ rdata->res.fattr = &rdata->fattr;
dprintk("NFS: nfs_readpage_sync(%p)\n", page);
*/
do {
if (count < rsize)
- rdata.args.count = count;
- rdata.res.count = rdata.args.count;
- rdata.args.offset = page_offset(page) + rdata.args.pgbase;
+ rdata->args.count = count;
+ rdata->res.count = rdata->args.count;
+ rdata->args.offset = page_offset(page) + rdata->args.pgbase;
dprintk("NFS: nfs_proc_read(%s, (%s/%Ld), %Lu, %u)\n",
NFS_SERVER(inode)->hostname,
inode->i_sb->s_id,
(long long)NFS_FILEID(inode),
- (unsigned long long)rdata.args.pgbase,
- rdata.args.count);
+ (unsigned long long)rdata->args.pgbase,
+ rdata->args.count);
lock_kernel();
- result = NFS_PROTO(inode)->read(&rdata, file);
+ result = NFS_PROTO(inode)->read(rdata);
unlock_kernel();
/*
goto io_error;
}
count -= result;
- rdata.args.pgbase += result;
+ rdata->args.pgbase += result;
/* Note: result == 0 should only happen if we're caching
* a write that extends the file and punches a hole.
*/
- if (rdata.res.eof != 0 || result == 0)
+ if (rdata->res.eof != 0 || result == 0)
break;
} while (count);
NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
if (count)
- memclear_highpage_flush(page, rdata.args.pgbase, count);
+ memclear_highpage_flush(page, rdata->args.pgbase, count);
SetPageUptodate(page);
if (PageError(page))
ClearPageError(page);
io_error:
unlock_page(page);
+ nfs_readdata_free(rdata);
return result;
}
-static int
-nfs_readpage_async(struct file *file, struct inode *inode, struct page *page)
+static int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
+ struct page *page)
{
LIST_HEAD(one_request);
struct nfs_page *new;
len = nfs_page_length(inode, page);
if (len == 0)
return nfs_return_empty_page(page);
- new = nfs_create_request(file, inode, page, 0, len);
+ new = nfs_create_request(ctx, inode, page, 0, len);
if (IS_ERR(new)) {
unlock_page(page);
return PTR_ERR(new);
nfs_unlock_request(req);
dprintk("NFS: read done (%s/%Ld %d@%Ld)\n",
- req->wb_inode->i_sb->s_id,
- (long long)NFS_FILEID(req->wb_inode),
+ req->wb_context->dentry->d_inode->i_sb->s_id,
+ (long long)NFS_FILEID(req->wb_context->dentry->d_inode),
req->wb_bytes,
(long long)req_offset(req));
}
struct inode *inode;
data->req = req;
- data->inode = inode = req->wb_inode;
- data->cred = req->wb_cred;
+ data->inode = inode = req->wb_context->dentry->d_inode;
+ data->cred = req->wb_context->cred;
data->args.fh = NFS_FH(inode);
data->args.offset = req_offset(req) + offset;
data->args.pgbase = req->wb_pgbase + offset;
data->args.pages = data->pagevec;
data->args.count = count;
- data->args.lockowner = req->wb_lockowner;
- data->args.state = req->wb_state;
+ data->args.context = req->wb_context;
data->res.fattr = &data->fattr;
data->res.count = count;
data = nfs_readdata_alloc();
if (!data)
goto out_bad;
+ INIT_LIST_HEAD(&data->pages);
list_add(&data->pages, &list);
requests++;
if (nbytes <= rsize)
if (!data)
goto out_bad;
+ INIT_LIST_HEAD(&data->pages);
pages = data->pagevec;
count = 0;
while (!list_empty(head)) {
return -ENOMEM;
}
-int
+static int
nfs_pagein_list(struct list_head *head, int rpages)
{
LIST_HEAD(one_request);
while (!list_empty(head)) {
pages += nfs_coalesce_requests(head, &one_request, rpages);
req = nfs_list_entry(one_request.next);
- error = nfs_pagein_one(&one_request, req->wb_inode);
+ error = nfs_pagein_one(&one_request, req->wb_context->dentry->d_inode);
if (error < 0)
break;
}
* - The error flag is set for this page. This happens only when a
* previous async read operation failed.
*/
-int
-nfs_readpage(struct file *file, struct page *page)
+int nfs_readpage(struct file *file, struct page *page)
{
+ struct nfs_open_context *ctx;
struct inode *inode = page->mapping->host;
int error;
if (error)
goto out_error;
+ if (file == NULL) {
+ ctx = nfs_find_open_context(inode, FMODE_READ);
+ if (ctx == NULL)
+ return -EBADF;
+ } else
+ ctx = get_nfs_open_context((struct nfs_open_context *)
+ file->private_data);
if (!IS_SYNC(inode)) {
- error = nfs_readpage_async(file, inode, page);
+ error = nfs_readpage_async(ctx, inode, page);
goto out;
}
- error = nfs_readpage_sync(file, inode, page);
+ error = nfs_readpage_sync(ctx, inode, page);
if (error < 0 && IS_SWAPFILE(inode))
printk("Aiee.. nfs swap-in of page failed!\n");
out:
+ put_nfs_open_context(ctx);
return error;
out_error:
unlock_page(page);
- goto out;
+ return error;
}
struct nfs_readdesc {
struct list_head *head;
- struct file *filp;
+ struct nfs_open_context *ctx;
};
static int
len = nfs_page_length(inode, page);
if (len == 0)
return nfs_return_empty_page(page);
- new = nfs_create_request(desc->filp, inode, page, 0, len);
+ new = nfs_create_request(desc->ctx, inode, page, 0, len);
if (IS_ERR(new)) {
SetPageError(page);
unlock_page(page);
return 0;
}
-int
-nfs_readpages(struct file *filp, struct address_space *mapping,
+int nfs_readpages(struct file *filp, struct address_space *mapping,
struct list_head *pages, unsigned nr_pages)
{
LIST_HEAD(head);
struct nfs_readdesc desc = {
- .filp = filp,
.head = &head,
};
struct inode *inode = mapping->host;
(long long)NFS_FILEID(inode),
nr_pages);
+ if (filp == NULL) {
+ desc.ctx = nfs_find_open_context(inode, FMODE_READ);
+ if (desc.ctx == NULL)
+ return -EBADF;
+ } else
+ desc.ctx = get_nfs_open_context((struct nfs_open_context *)
+ filp->private_data);
ret = read_cache_pages(mapping, pages, readpage_async_filler, &desc);
if (!list_empty(&head)) {
int err = nfs_pagein_list(&head, server->rpages);
if (!ret)
ret = err;
}
+ put_nfs_open_context(desc.ctx);
return ret;
}
git://git.onelab.eu / linux-2.6.git / blobdiff