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

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

NFS: Rename nfs_readdir_free_pagearray() and nfs_readdir_large_page() 



nfs_readdir_xdr_to_array() uses both a cache array and an array of
pages, so I rename these functions to make it clearer how the code
works.  nfs_readdir_large_page() becomes nfs_readdir_alloc_pages()
because this function has absolutely nothing to do with setting up a
large page.  nfs_readdir_free_pagearray() becomes
nfs_readdir_free_pages() to stay consistent with the new alloc_pages()
function.

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

fs/nfs/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *en 
}



static

void nfs_readdir_free_pagearray(struct page **pages, unsigned int npages)

void nfs_readdir_free_pages(struct page **pages, unsigned int npages)

{

	unsigned int i;

	for (i = 0; i < npages; i++)
@@ -595,7 +595,7 @@ void nfs_readdir_free_pagearray(struct page **pages, unsigned int npages) 
 * to nfs_readdir_free_pagearray

 */

static

int nfs_readdir_large_page(struct page **pages, unsigned int npages)

int nfs_readdir_alloc_pages(struct page **pages, unsigned int npages)

{

	unsigned int i;
@@ -608,7 +608,7 @@ int nfs_readdir_large_page(struct page **pages, unsigned int npages) 
	return 0;



out_freepages:

	nfs_readdir_free_pagearray(pages, i);

	nfs_readdir_free_pages(pages, i);

	return -ENOMEM;

}
@@ -645,7 +645,7 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, 
	memset(array, 0, sizeof(struct nfs_cache_array));

	array->eof_index = -1;



	status = nfs_readdir_large_page(pages, array_size);

	status = nfs_readdir_alloc_pages(pages, array_size);

	if (status < 0)

		goto out_release_array;

	do {
@@ -663,7 +663,7 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, 
		}

	} while (array->eof_index < 0);



	nfs_readdir_free_pagearray(pages, array_size);

	nfs_readdir_free_pages(pages, array_size);

out_release_array:

	nfs_readdir_release_array(page);

out_label_free: