Commit c0752cdf authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Create a common read and write header struct 



The only difference is the write verifier field, but we can keep that
for a little bit longer.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 9c7e1b3d

fs/nfs/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ extern int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh, bool 


struct nfs_pgio_completion_ops;

/* read.c */

extern struct nfs_read_header *nfs_readhdr_alloc(void);

extern struct nfs_rw_header *nfs_readhdr_alloc(void);

extern void nfs_readhdr_free(struct nfs_pgio_header *hdr);

extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,

			struct inode *inode, bool force_mds,
@@ -424,7 +424,7 @@ int nfs_remount(struct super_block *sb, int *flags, char *raw_data); 
extern void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio,

			struct inode *inode, int ioflags, bool force_mds,

			const struct nfs_pgio_completion_ops *compl_ops);

extern struct nfs_write_header *nfs_writehdr_alloc(void);

extern struct nfs_rw_header *nfs_writehdr_alloc(void);

extern void nfs_writehdr_free(struct nfs_pgio_header *hdr);

extern int nfs_generic_flush(struct nfs_pageio_descriptor *desc,

			     struct nfs_pgio_header *hdr);

fs/nfs/pnfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ EXPORT_SYMBOL_GPL(pnfs_writehdr_free); 
int

pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc)

{

	struct nfs_write_header *whdr;

	struct nfs_rw_header *whdr;

	struct nfs_pgio_header *hdr;

	int ret;
@@ -1750,7 +1750,7 @@ EXPORT_SYMBOL_GPL(pnfs_readhdr_free); 
int

pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc)

{

	struct nfs_read_header *rhdr;

	struct nfs_rw_header *rhdr;

	struct nfs_pgio_header *hdr;

	int ret;

fs/nfs/read.c

+7 −7
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops; 


static struct kmem_cache *nfs_rdata_cachep;



struct nfs_read_header *nfs_readhdr_alloc(void)

struct nfs_rw_header *nfs_readhdr_alloc(void)

{

	struct nfs_read_header *rhdr;

	struct nfs_rw_header *rhdr;



	rhdr = kmem_cache_zalloc(nfs_rdata_cachep, GFP_KERNEL);

	if (rhdr) {
@@ -56,7 +56,7 @@ static struct nfs_pgio_data *nfs_readdata_alloc(struct nfs_pgio_header *hdr, 
{

	struct nfs_pgio_data *data, *prealloc;



	prealloc = &container_of(hdr, struct nfs_read_header, header)->rpc_data;

	prealloc = &container_of(hdr, struct nfs_rw_header, header)->rpc_data;

	if (prealloc->header == NULL)

		data = prealloc;

	else
@@ -78,7 +78,7 @@ static struct nfs_pgio_data *nfs_readdata_alloc(struct nfs_pgio_header *hdr, 


void nfs_readhdr_free(struct nfs_pgio_header *hdr)

{

	struct nfs_read_header *rhdr = container_of(hdr, struct nfs_read_header, header);

	struct nfs_rw_header *rhdr = container_of(hdr, struct nfs_rw_header, header);



	kmem_cache_free(nfs_rdata_cachep, rhdr);

}
@@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(nfs_readhdr_free); 
void nfs_readdata_release(struct nfs_pgio_data *rdata)

{

	struct nfs_pgio_header *hdr = rdata->header;

	struct nfs_read_header *read_header = container_of(hdr, struct nfs_read_header, header);

	struct nfs_rw_header *read_header = container_of(hdr, struct nfs_rw_header, header);



	put_nfs_open_context(rdata->args.context);

	if (rdata->pages.pagevec != rdata->pages.page_array)
@@ -417,7 +417,7 @@ EXPORT_SYMBOL_GPL(nfs_generic_pagein); 


static int nfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc)

{

	struct nfs_read_header *rhdr;

	struct nfs_rw_header *rhdr;

	struct nfs_pgio_header *hdr;

	int ret;
@@ -680,7 +680,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping, 
int __init nfs_init_readpagecache(void)

{

	nfs_rdata_cachep = kmem_cache_create("nfs_read_data",

					     sizeof(struct nfs_read_header),

					     sizeof(struct nfs_rw_header),

					     0, SLAB_HWCACHE_ALIGN,

					     NULL);

	if (nfs_rdata_cachep == NULL)

fs/nfs/write.c

+7 −7
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ void nfs_commit_free(struct nfs_commit_data *p) 
}

EXPORT_SYMBOL_GPL(nfs_commit_free);



struct nfs_write_header *nfs_writehdr_alloc(void)

struct nfs_rw_header *nfs_writehdr_alloc(void)

{

	struct nfs_write_header *p = mempool_alloc(nfs_wdata_mempool, GFP_NOIO);

	struct nfs_rw_header *p = mempool_alloc(nfs_wdata_mempool, GFP_NOIO);



	if (p) {

		struct nfs_pgio_header *hdr = &p->header;
@@ -93,7 +93,7 @@ static struct nfs_pgio_data *nfs_writedata_alloc(struct nfs_pgio_header *hdr, 
{

	struct nfs_pgio_data *data, *prealloc;



	prealloc = &container_of(hdr, struct nfs_write_header, header)->rpc_data;

	prealloc = &container_of(hdr, struct nfs_rw_header, header)->rpc_data;

	if (prealloc->header == NULL)

		data = prealloc;

	else
@@ -115,7 +115,7 @@ static struct nfs_pgio_data *nfs_writedata_alloc(struct nfs_pgio_header *hdr, 


void nfs_writehdr_free(struct nfs_pgio_header *hdr)

{

	struct nfs_write_header *whdr = container_of(hdr, struct nfs_write_header, header);

	struct nfs_rw_header *whdr = container_of(hdr, struct nfs_rw_header, header);

	mempool_free(whdr, nfs_wdata_mempool);

}

EXPORT_SYMBOL_GPL(nfs_writehdr_free);
@@ -123,7 +123,7 @@ EXPORT_SYMBOL_GPL(nfs_writehdr_free); 
void nfs_writedata_release(struct nfs_pgio_data *wdata)

{

	struct nfs_pgio_header *hdr = wdata->header;

	struct nfs_write_header *write_header = container_of(hdr, struct nfs_write_header, header);

	struct nfs_rw_header *write_header = container_of(hdr, struct nfs_rw_header, header);



	put_nfs_open_context(wdata->args.context);

	if (wdata->pages.pagevec != wdata->pages.page_array)
@@ -1253,7 +1253,7 @@ EXPORT_SYMBOL_GPL(nfs_generic_flush); 


static int nfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc)

{

	struct nfs_write_header *whdr;

	struct nfs_rw_header *whdr;

	struct nfs_pgio_header *hdr;

	int ret;
@@ -1910,7 +1910,7 @@ int nfs_migrate_page(struct address_space *mapping, struct page *newpage, 
int __init nfs_init_writepagecache(void)

{

	nfs_wdata_cachep = kmem_cache_create("nfs_write_data",

					     sizeof(struct nfs_write_header),

					     sizeof(struct nfs_rw_header),

					     0, SLAB_HWCACHE_ALIGN,

					     NULL);

	if (nfs_wdata_cachep == NULL)

include/linux/nfs_xdr.h

+1 −6
Original line number Diff line number Diff line
@@ -1294,12 +1294,7 @@ struct nfs_pgio_data { 
	struct nfs_client	*ds_clp;	/* pNFS data server */

};



struct nfs_read_header {

	struct nfs_pgio_header	header;

	struct nfs_pgio_data	rpc_data;

};



struct nfs_write_header {

struct nfs_rw_header {

	struct nfs_pgio_header	header;

	struct nfs_pgio_data	rpc_data;

	struct nfs_writeverf	verf;