aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 3a2fc5c4c79a..37c4c988519c 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -70,9 +70,9 @@ void nfs_commit_free(struct nfs_commit_data *p)
70} 70}
71EXPORT_SYMBOL_GPL(nfs_commit_free); 71EXPORT_SYMBOL_GPL(nfs_commit_free);
72 72
73struct nfs_write_header *nfs_writehdr_alloc(void) 73struct nfs_rw_header *nfs_writehdr_alloc(void)
74{ 74{
75 struct nfs_write_header *p = mempool_alloc(nfs_wdata_mempool, GFP_NOIO); 75 struct nfs_rw_header *p = mempool_alloc(nfs_wdata_mempool, GFP_NOIO);
76 76
77 if (p) { 77 if (p) {
78 struct nfs_pgio_header *hdr = &p->header; 78 struct nfs_pgio_header *hdr = &p->header;
@@ -93,7 +93,7 @@ static struct nfs_pgio_data *nfs_writedata_alloc(struct nfs_pgio_header *hdr,
93{ 93{
94 struct nfs_pgio_data *data, *prealloc; 94 struct nfs_pgio_data *data, *prealloc;
95 95
96 prealloc = &container_of(hdr, struct nfs_write_header, header)->rpc_data; 96 prealloc = &container_of(hdr, struct nfs_rw_header, header)->rpc_data;
97 if (prealloc->header == NULL) 97 if (prealloc->header == NULL)
98 data = prealloc; 98 data = prealloc;
99 else 99 else
@@ -115,7 +115,7 @@ out:
115 115
116void nfs_writehdr_free(struct nfs_pgio_header *hdr) 116void nfs_writehdr_free(struct nfs_pgio_header *hdr)
117{ 117{
118 struct nfs_write_header *whdr = container_of(hdr, struct nfs_write_header, header); 118 struct nfs_rw_header *whdr = container_of(hdr, struct nfs_rw_header, header);
119 mempool_free(whdr, nfs_wdata_mempool); 119 mempool_free(whdr, nfs_wdata_mempool);
120} 120}
121EXPORT_SYMBOL_GPL(nfs_writehdr_free); 121EXPORT_SYMBOL_GPL(nfs_writehdr_free);
@@ -123,7 +123,7 @@ EXPORT_SYMBOL_GPL(nfs_writehdr_free);
123void nfs_writedata_release(struct nfs_pgio_data *wdata) 123void nfs_writedata_release(struct nfs_pgio_data *wdata)
124{ 124{
125 struct nfs_pgio_header *hdr = wdata->header; 125 struct nfs_pgio_header *hdr = wdata->header;
126 struct nfs_write_header *write_header = container_of(hdr, struct nfs_write_header, header); 126 struct nfs_rw_header *write_header = container_of(hdr, struct nfs_rw_header, header);
127 127
128 put_nfs_open_context(wdata->args.context); 128 put_nfs_open_context(wdata->args.context);
129 if (wdata->pages.pagevec != wdata->pages.page_array) 129 if (wdata->pages.pagevec != wdata->pages.page_array)
@@ -1253,7 +1253,7 @@ EXPORT_SYMBOL_GPL(nfs_generic_flush);
1253 1253
1254static int nfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) 1254static int nfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc)
1255{ 1255{
1256 struct nfs_write_header *whdr; 1256 struct nfs_rw_header *whdr;
1257 struct nfs_pgio_header *hdr; 1257 struct nfs_pgio_header *hdr;
1258 int ret; 1258 int ret;
1259 1259
@@ -1910,7 +1910,7 @@ int nfs_migrate_page(struct address_space *mapping, struct page *newpage,
1910int __init nfs_init_writepagecache(void) 1910int __init nfs_init_writepagecache(void)
1911{ 1911{
1912 nfs_wdata_cachep = kmem_cache_create("nfs_write_data", 1912 nfs_wdata_cachep = kmem_cache_create("nfs_write_data",
1913 sizeof(struct nfs_write_header), 1913 sizeof(struct nfs_rw_header),
1914 0, SLAB_HWCACHE_ALIGN, 1914 0, SLAB_HWCACHE_ALIGN,
1915 NULL); 1915 NULL);
1916 if (nfs_wdata_cachep == NULL) 1916 if (nfs_wdata_cachep == NULL)