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

Commit 8ef9b0b9 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Trond Myklebust
Browse files

NFS: move nfs_pgarray_set() to open code 



Since commit 00bfa30a ("NFS: Create a common pgio_alloc and
pgio_release function"), nfs_pgarray_set() has only a single caller.  Let's
open code it.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ae97aa52

fs/nfs/pagelist.c

+14 −20
Original line number Diff line number Diff line
@@ -29,20 +29,6 @@ 
static struct kmem_cache *nfs_page_cachep;

static const struct rpc_call_ops nfs_pgio_common_ops;



static bool nfs_pgarray_set(struct nfs_page_array *p, unsigned int pagecount,

					gfp_t gfp_flags)

{

	p->npages = pagecount;

	if (pagecount <= ARRAY_SIZE(p->page_array))

		p->pagevec = p->page_array;

	else {

		p->pagevec = kcalloc(pagecount, sizeof(struct page *), gfp_flags);

		if (!p->pagevec)

			p->npages = 0;

	}

	return p->pagevec != NULL;

}



struct nfs_pgio_mirror *

nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc)

{
@@ -758,17 +744,25 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, 
				*last_page;

	struct list_head *head = &mirror->pg_list;

	struct nfs_commit_info cinfo;

	struct nfs_page_array *pg_array = &hdr->page_array;

	unsigned int pagecount, pageused;

	gfp_t gfp_flags = GFP_KERNEL;



	pagecount = nfs_page_array_len(mirror->pg_base, mirror->pg_count);



	if (pagecount <= ARRAY_SIZE(pg_array->page_array))

		pg_array->pagevec = pg_array->page_array;

	else {

		if (desc->pg_rw_ops->rw_mode == FMODE_WRITE)

			gfp_flags = GFP_NOIO;

	if (!nfs_pgarray_set(&hdr->page_array, pagecount, gfp_flags)) {

		pg_array->pagevec = kcalloc(pagecount, sizeof(struct page *), gfp_flags);

		if (!pg_array->pagevec) {

			pg_array->npages = 0;

			nfs_pgio_error(hdr);

			desc->pg_error = -ENOMEM;

			return desc->pg_error;

		}

	}



	nfs_init_cinfo(&cinfo, desc->pg_inode, desc->pg_dreq);

	pages = hdr->page_array.pagevec;