diff options
author | Fred Isaman <iisaman@netapp.com> | 2012-04-20 14:47:47 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:10:37 -0400 |
commit | 6c75dc0d498caa402fb17b1bf769835a9db875c8 (patch) | |
tree | b367bb2428c011f20b8fd47a6dd0b8603ee136ba /fs/nfs/direct.c | |
parent | 4db6e0b74c0f6dfc2f9c0690e8df512e3b635983 (diff) |
NFS: merge _full and _partial write rpc_ops
Decouple nfs_pgio_header and nfs_write_data, and have (possibly
multiple) nfs_write_datas each take a refcount on nfs_pgio_header.
For the moment keeps nfs_write_header as a way to preallocate a single
nfs_write_data with the nfs_pgio_header. The code doesn't need this,
and would be prettier without, but given the amount of churn I am
already introducing I didn't want to play with tuning new mempools.
This also fixes bug in pnfs_ld_handle_write_error. In the case of
desc->pg_bsize < PAGE_CACHE_SIZE, the pages list was empty, causing
replay attempt to do nothing.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r-- | fs/nfs/direct.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 90b00ce42cbe..22a40c408449 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -768,11 +768,17 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_direct_req *dreq, | |||
768 | bytes = min(wsize,count); | 768 | bytes = min(wsize,count); |
769 | 769 | ||
770 | result = -ENOMEM; | 770 | result = -ENOMEM; |
771 | whdr = nfs_writehdr_alloc(nfs_page_array_len(pgbase, bytes)); | 771 | whdr = nfs_writehdr_alloc(); |
772 | if (unlikely(!whdr)) | 772 | if (unlikely(!whdr)) |
773 | break; | 773 | break; |
774 | 774 | ||
775 | data = &whdr->rpc_data; | 775 | data = nfs_writedata_alloc(&whdr->header, nfs_page_array_len(pgbase, bytes)); |
776 | if (!data) { | ||
777 | nfs_writehdr_free(&whdr->header); | ||
778 | break; | ||
779 | } | ||
780 | data->header = &whdr->header; | ||
781 | atomic_inc(&data->header->refcnt); | ||
776 | pages = &data->pages; | 782 | pages = &data->pages; |
777 | 783 | ||
778 | down_read(¤t->mm->mmap_sem); | 784 | down_read(¤t->mm->mmap_sem); |