Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f945357 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Clean up - simplify the switch to read/write-through-MDS 



Use nfs_pageio_reset_read_mds and nfs_pageio_reset_write_mds instead of
completely reinitialising the struct nfs_pageio_descriptor.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent dce81290

fs/nfs/internal.h

+0 −4
Original line number Diff line number Diff line
@@ -299,16 +299,12 @@ extern void nfs_read_prepare(struct rpc_task *task, void *calldata); 
extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,

		struct list_head *head);



extern void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,

		struct inode *inode);

extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);

extern void nfs_readdata_release(struct nfs_read_data *rdata);



/* write.c */

extern int nfs_generic_flush(struct nfs_pageio_descriptor *desc,

		struct list_head *head);

extern void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio,

				  struct inode *inode, int ioflags);

extern void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio);

extern void nfs_writedata_release(struct nfs_write_data *wdata);

extern void nfs_commit_free(struct nfs_write_data *p);

fs/nfs/nfs4filelayout.c

+2 −3
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, 
					   GFP_KERNEL);

	/* If no lseg, fall back to read through mds */

	if (pgio->pg_lseg == NULL)

		nfs_pageio_init_read_mds(pgio, pgio->pg_inode);

		nfs_pageio_reset_read_mds(pgio);

}



void
@@ -728,8 +728,7 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio, 
					   GFP_NOFS);

	/* If no lseg, fall back to write through mds */

	if (pgio->pg_lseg == NULL)

		nfs_pageio_init_write_mds(pgio, pgio->pg_inode,

					  pgio->pg_ioflags);

		nfs_pageio_reset_write_mds(pgio);

}



static const struct nfs_pageio_ops filelayout_pg_read_ops = {

fs/nfs/pnfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r 
					   GFP_KERNEL);

	/* If no lseg, fall back to read through mds */

	if (pgio->pg_lseg == NULL)

		nfs_pageio_init_read_mds(pgio, pgio->pg_inode);

		nfs_pageio_reset_read_mds(pgio);



}

EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_read);
@@ -1093,7 +1093,7 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page * 
					   GFP_NOFS);

	/* If no lseg, fall back to write through mds */

	if (pgio->pg_lseg == NULL)

		nfs_pageio_init_write_mds(pgio, pgio->pg_inode, pgio->pg_ioflags);

		nfs_pageio_reset_write_mds(pgio);

}

EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_write);

fs/nfs/read.c

+2 −2
Original line number Diff line number Diff line
@@ -112,19 +112,19 @@ static void nfs_readpage_truncate_uninitialised_page(struct nfs_read_data *data) 
	}

}



void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,

static void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,

		struct inode *inode)

{

	nfs_pageio_init(pgio, inode, &nfs_pageio_read_ops,

			NFS_SERVER(inode)->rsize, 0);

}

EXPORT_SYMBOL_GPL(nfs_pageio_init_read_mds);



void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio)

{

	pgio->pg_ops = &nfs_pageio_read_ops;

	pgio->pg_bsize = NFS_SERVER(pgio->pg_inode)->rsize;

}

EXPORT_SYMBOL_GPL(nfs_pageio_reset_read_mds);



static void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,

		struct inode *inode)

fs/nfs/write.c

+2 −2
Original line number Diff line number Diff line
@@ -1051,19 +1051,19 @@ static const struct nfs_pageio_ops nfs_pageio_write_ops = { 
	.pg_doio = nfs_generic_pg_writepages,

};



void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio,

static void nfs_pageio_init_write_mds(struct nfs_pageio_descriptor *pgio,

				  struct inode *inode, int ioflags)

{

	nfs_pageio_init(pgio, inode, &nfs_pageio_write_ops,

				NFS_SERVER(inode)->wsize, ioflags);

}

EXPORT_SYMBOL_GPL(nfs_pageio_init_write_mds);



void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio)

{

	pgio->pg_ops = &nfs_pageio_write_ops;

	pgio->pg_bsize = NFS_SERVER(pgio->pg_inode)->wsize;

}

EXPORT_SYMBOL_GPL(nfs_pageio_reset_write_mds);



static void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio,

				  struct inode *inode, int ioflags)