Commit 0b936e37 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust

NFS: Remove unused variable "pages_ptr"

This variable is initialized to NULL and is never modified before being
passed to nfs_readdir_free_large_page().  But that's okay, because
nfs_readdir_free_large_page() only seems to exist as a way of calling
nfs_readdir_free_pagearray() without this parameter.  Let's simplify by
removing pages_ptr and nfs_readdir_free_pagearray().
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ce603281
...@@ -590,16 +590,9 @@ void nfs_readdir_free_pagearray(struct page **pages, unsigned int npages) ...@@ -590,16 +590,9 @@ void nfs_readdir_free_pagearray(struct page **pages, unsigned int npages)
put_page(pages[i]); put_page(pages[i]);
} }
static
void nfs_readdir_free_large_page(void *ptr, struct page **pages,
unsigned int npages)
{
nfs_readdir_free_pagearray(pages, npages);
}
/* /*
* nfs_readdir_large_page will allocate pages that must be freed with a call * nfs_readdir_large_page will allocate pages that must be freed with a call
* to nfs_readdir_free_large_page * to nfs_readdir_free_pagearray
*/ */
static static
int nfs_readdir_large_page(struct page **pages, unsigned int npages) int nfs_readdir_large_page(struct page **pages, unsigned int npages)
...@@ -623,7 +616,6 @@ static ...@@ -623,7 +616,6 @@ static
int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, struct inode *inode) int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, struct inode *inode)
{ {
struct page *pages[NFS_MAX_READDIR_PAGES]; struct page *pages[NFS_MAX_READDIR_PAGES];
void *pages_ptr = NULL;
struct nfs_entry entry; struct nfs_entry entry;
struct file *file = desc->file; struct file *file = desc->file;
struct nfs_cache_array *array; struct nfs_cache_array *array;
...@@ -671,7 +663,7 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, ...@@ -671,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_large_page(pages_ptr, pages, array_size); nfs_readdir_free_pagearray(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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment