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

Commit 3bde7afd authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Remove unused parameter gfp_flags from nfs_pageio_init() 



Now that the mirror allocation has been moved, the parameter can go.
Also remove the redundant symbol export.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 14abcb0b

fs/nfs/pagelist.c

+1 −3
Original line number Diff line number Diff line
@@ -711,8 +711,7 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, 
		     const struct nfs_pgio_completion_ops *compl_ops,

		     const struct nfs_rw_ops *rw_ops,

		     size_t bsize,

		     int io_flags,

		     gfp_t gfp_flags)

		     int io_flags)

{

	desc->pg_moreio = 0;

	desc->pg_inode = inode;
@@ -733,7 +732,6 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, 
	desc->pg_mirrors = desc->pg_mirrors_static;

	nfs_pageio_mirror_init(&desc->pg_mirrors[0], bsize);

}

EXPORT_SYMBOL_GPL(nfs_pageio_init);



/**

 * nfs_pgio_result - Basic pageio error handling

fs/nfs/read.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, 
		pg_ops = server->pnfs_curr_ld->pg_read_ops;

#endif

	nfs_pageio_init(pgio, inode, pg_ops, compl_ops, &nfs_rw_read_ops,

			server->rsize, 0, GFP_KERNEL);

			server->rsize, 0);

}

EXPORT_SYMBOL_GPL(nfs_pageio_init_read);

fs/nfs/write.c

+1 −1
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, 
		pg_ops = server->pnfs_curr_ld->pg_write_ops;

#endif

	nfs_pageio_init(pgio, inode, pg_ops, compl_ops, &nfs_rw_write_ops,

			server->wsize, ioflags, GFP_NOIO);

			server->wsize, ioflags);

}

EXPORT_SYMBOL_GPL(nfs_pageio_init_write);

include/linux/nfs_page.h

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc, 
			     const struct nfs_pgio_completion_ops *compl_ops,

			     const struct nfs_rw_ops *rw_ops,

			     size_t bsize,

			     int how,

			     gfp_t gfp_flags);

			     int how);

extern	int nfs_pageio_add_request(struct nfs_pageio_descriptor *,

				   struct nfs_page *);

extern  int nfs_pageio_resend(struct nfs_pageio_descriptor *,