*
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
struct nfs_open_context *ctx; /* file open context info */
struct kiocb * iocb; /* controlling i/o request */
struct inode * inode; /* target file of i/o */
+ unsigned long user_addr; /* location of user's buffer */
+ size_t user_count; /* total bytes to move */
+ loff_t pos; /* starting offset in file */
struct page ** pages; /* pages in our buffer */
unsigned int npages; /* count of pages */
/* completion state */
- atomic_t io_count; /* i/os we're waiting for */
spinlock_t lock; /* protect completion state */
+ int outstanding; /* i/os we're waiting for */
ssize_t count, /* bytes actually processed */
error; /* any reported error */
struct completion completion; /* wait for i/o completion */
struct nfs_writeverf verf; /* unstable write verifier */
};
+static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, int sync);
static void nfs_direct_write_complete(struct nfs_direct_req *dreq, struct inode *inode);
-static const struct rpc_call_ops nfs_write_direct_ops;
-
-static inline void get_dreq(struct nfs_direct_req *dreq)
-{
- atomic_inc(&dreq->io_count);
-}
-
-static inline int put_dreq(struct nfs_direct_req *dreq)
-{
- return atomic_dec_and_test(&dreq->io_count);
-}
/**
* nfs_direct_IO - NFS address space operation for direct I/O
return -EINVAL;
}
-static void nfs_direct_dirty_pages(struct page **pages, int npages)
+static void nfs_free_user_pages(struct page **pages, int npages, int do_dirty)
{
int i;
for (i = 0; i < npages; i++) {
struct page *page = pages[i];
- if (!PageCompound(page))
+ if (do_dirty && !PageCompound(page))
set_page_dirty_lock(page);
+ page_cache_release(page);
}
-}
-
-static void nfs_direct_release_pages(struct page **pages, int npages)
-{
- int i;
- for (i = 0; i < npages; i++)
- page_cache_release(pages[i]);
+ kfree(pages);
}
static inline int nfs_get_user_pages(int rw, unsigned long user_addr, size_t size, struct page ***pages)
* end of a mapping; return EFAULT.
*/
if (result >= 0) {
- nfs_direct_release_pages(*pages, result);
+ nfs_free_user_pages(*pages, result, 0);
result = -EFAULT;
} else
kfree(*pages);
dreq->iocb = NULL;
dreq->ctx = NULL;
spin_lock_init(&dreq->lock);
- atomic_set(&dreq->io_count, 0);
+ dreq->outstanding = 0;
dreq->count = 0;
dreq->error = 0;
dreq->flags = 0;
*/
static void nfs_direct_complete(struct nfs_direct_req *dreq)
{
+ nfs_free_user_pages(dreq->pages, dreq->npages, 1);
+
if (dreq->iocb) {
long res = (long) dreq->error;
if (!res)
list_add(&data->pages, list);
data->req = (struct nfs_page *) dreq;
- get_dreq(dreq);
+ dreq->outstanding++;
if (nbytes <= rsize)
break;
nbytes -= rsize;
else
dreq->error = task->tk_status;
- spin_unlock(&dreq->lock);
-
- if (put_dreq(dreq)) {
- nfs_direct_dirty_pages(dreq->pages, dreq->npages);
- nfs_direct_release_pages(dreq->pages, dreq->npages);
- nfs_direct_complete(dreq);
+ if (--dreq->outstanding) {
+ spin_unlock(&dreq->lock);
+ return;
}
+
+ spin_unlock(&dreq->lock);
+ nfs_direct_complete(dreq);
}
static const struct rpc_call_ops nfs_read_direct_ops = {
* For each nfs_read_data struct that was allocated on the list, dispatch
* an NFS READ operation
*/
-static void nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned long user_addr, size_t count, loff_t pos)
+static void nfs_direct_read_schedule(struct nfs_direct_req *dreq)
{
struct nfs_open_context *ctx = dreq->ctx;
struct inode *inode = ctx->dentry->d_inode;
struct list_head *list = &dreq->list;
struct page **pages = dreq->pages;
+ size_t count = dreq->user_count;
+ loff_t pos = dreq->pos;
size_t rsize = NFS_SERVER(inode)->rsize;
unsigned int curpage, pgbase;
curpage = 0;
- pgbase = user_addr & ~PAGE_MASK;
+ pgbase = dreq->user_addr & ~PAGE_MASK;
do {
struct nfs_read_data *data;
size_t bytes;
if (!dreq)
return -ENOMEM;
+ dreq->user_addr = user_addr;
+ dreq->user_count = count;
+ dreq->pos = pos;
dreq->pages = pages;
dreq->npages = nr_pages;
dreq->inode = inode;
nfs_add_stats(inode, NFSIOS_DIRECTREADBYTES, count);
rpc_clnt_sigmask(clnt, &oldset);
- nfs_direct_read_schedule(dreq, user_addr, count, pos);
+ nfs_direct_read_schedule(dreq);
result = nfs_direct_wait(dreq);
rpc_clnt_sigunmask(clnt, &oldset);
list_del(&data->pages);
nfs_writedata_release(data);
}
- nfs_direct_release_pages(dreq->pages, dreq->npages);
}
#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
{
- struct inode *inode = dreq->inode;
- struct list_head *p;
- struct nfs_write_data *data;
+ struct list_head *pos;
+ list_splice_init(&dreq->rewrite_list, &dreq->list);
+ list_for_each(pos, &dreq->list)
+ dreq->outstanding++;
dreq->count = 0;
- get_dreq(dreq);
-
- list_for_each(p, &dreq->rewrite_list) {
- data = list_entry(p, struct nfs_write_data, pages);
-
- get_dreq(dreq);
-
- /*
- * Reset data->res.
- */
- nfs_fattr_init(&data->fattr);
- data->res.count = data->args.count;
- memset(&data->verf, 0, sizeof(data->verf));
- /*
- * Reuse data->task; data->args should not have changed
- * since the original request was sent.
- */
- rpc_init_task(&data->task, NFS_CLIENT(inode), RPC_TASK_ASYNC,
- &nfs_write_direct_ops, data);
- NFS_PROTO(inode)->write_setup(data, FLUSH_STABLE);
-
- data->task.tk_priority = RPC_PRIORITY_NORMAL;
- data->task.tk_cookie = (unsigned long) inode;
-
- /*
- * We're called via an RPC callback, so BKL is already held.
- */
- rpc_execute(&data->task);
-
- dprintk("NFS: %5u rescheduled direct write call (req %s/%Ld, %u bytes @ offset %Lu)\n",
- data->task.tk_pid,
- inode->i_sb->s_id,
- (long long)NFS_FILEID(inode),
- data->args.count,
- (unsigned long long)data->args.offset);
- }
-
- if (put_dreq(dreq))
- nfs_direct_write_complete(dreq, inode);
+ nfs_direct_write_schedule(dreq, FLUSH_STABLE);
}
static void nfs_direct_commit_result(struct rpc_task *task, void *calldata)
data->cred = dreq->ctx->cred;
data->args.fh = NFS_FH(data->inode);
- data->args.offset = 0;
- data->args.count = 0;
+ data->args.offset = dreq->pos;
+ data->args.count = dreq->user_count;
data->res.count = 0;
data->res.fattr = &data->fattr;
data->res.verf = &data->verf;
list_add(&data->pages, list);
data->req = (struct nfs_page *) dreq;
- get_dreq(dreq);
+ dreq->outstanding++;
if (nbytes <= wsize)
break;
nbytes -= wsize;
}
}
}
+ /* In case we have to resend */
+ data->args.stable = NFS_FILE_SYNC;
spin_unlock(&dreq->lock);
}
struct nfs_write_data *data = calldata;
struct nfs_direct_req *dreq = (struct nfs_direct_req *) data->req;
- if (put_dreq(dreq))
- nfs_direct_write_complete(dreq, data->inode);
+ spin_lock(&dreq->lock);
+ if (--dreq->outstanding) {
+ spin_unlock(&dreq->lock);
+ return;
+ }
+ spin_unlock(&dreq->lock);
+
+ nfs_direct_write_complete(dreq, data->inode);
}
static const struct rpc_call_ops nfs_write_direct_ops = {
* For each nfs_write_data struct that was allocated on the list, dispatch
* an NFS WRITE operation
*/
-static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, unsigned long user_addr, size_t count, loff_t pos, int sync)
+static void nfs_direct_write_schedule(struct nfs_direct_req *dreq, int sync)
{
struct nfs_open_context *ctx = dreq->ctx;
struct inode *inode = ctx->dentry->d_inode;
struct list_head *list = &dreq->list;
struct page **pages = dreq->pages;
+ size_t count = dreq->user_count;
+ loff_t pos = dreq->pos;
size_t wsize = NFS_SERVER(inode)->wsize;
unsigned int curpage, pgbase;
curpage = 0;
- pgbase = user_addr & ~PAGE_MASK;
+ pgbase = dreq->user_addr & ~PAGE_MASK;
do {
struct nfs_write_data *data;
size_t bytes;
if (dreq->commit_data == NULL || count < wsize)
sync = FLUSH_STABLE;
+ dreq->user_addr = user_addr;
+ dreq->user_count = count;
+ dreq->pos = pos;
dreq->pages = pages;
dreq->npages = nr_pages;
dreq->inode = inode;
nfs_begin_data_update(inode);
rpc_clnt_sigmask(clnt, &oldset);
- nfs_direct_write_schedule(dreq, user_addr, count, pos, sync);
+ nfs_direct_write_schedule(dreq, sync);
result = nfs_direct_wait(dreq);
rpc_clnt_sigunmask(clnt, &oldset);
* nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures
*
*/
-void __exit nfs_destroy_directcache(void)
+void nfs_destroy_directcache(void)
{
if (kmem_cache_destroy(nfs_direct_cachep))
printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");