|
@@ -583,7 +583,7 @@ out_nopages:
|
|
}
|
|
}
|
|
|
|
|
|
static
|
|
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;
|
|
unsigned int i;
|
|
for (i = 0; i < npages; 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
|
|
* to nfs_readdir_free_pagearray
|
|
*/
|
|
*/
|
|
static
|
|
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;
|
|
unsigned int i;
|
|
|
|
|
|
@@ -608,7 +608,7 @@ int nfs_readdir_large_page(struct page **pages, unsigned int npages)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
out_freepages:
|
|
out_freepages:
|
|
- nfs_readdir_free_pagearray(pages, i);
|
|
|
|
|
|
+ nfs_readdir_free_pages(pages, i);
|
|
return -ENOMEM;
|
|
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));
|
|
memset(array, 0, sizeof(struct nfs_cache_array));
|
|
array->eof_index = -1;
|
|
array->eof_index = -1;
|
|
|
|
|
|
- status = nfs_readdir_large_page(pages, array_size);
|
|
|
|
|
|
+ status = nfs_readdir_alloc_pages(pages, array_size);
|
|
if (status < 0)
|
|
if (status < 0)
|
|
goto out_release_array;
|
|
goto out_release_array;
|
|
do {
|
|
do {
|
|
@@ -663,7 +663,7 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,
|
|
}
|
|
}
|
|
} while (array->eof_index < 0);
|
|
} while (array->eof_index < 0);
|
|
|
|
|
|
- nfs_readdir_free_pagearray(pages, array_size);
|
|
|
|
|
|
+ nfs_readdir_free_pages(pages, array_size);
|
|
out_release_array:
|
|
out_release_array:
|
|
nfs_readdir_release_array(page);
|
|
nfs_readdir_release_array(page);
|
|
out_label_free:
|
|
out_label_free:
|