diff options
| author | Anna Schumaker <Anna.Schumaker@netapp.com> | 2015-07-13 14:01:24 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-17 13:29:24 -0500 |
| commit | 0b936e37df8111ea727263a5a246b58e05b7aa1b (patch) | |
| tree | 040403a8f9b283282f3a895c195b549c9a3eae75 /fs/nfs/dir.c | |
| parent | ce603281468cf1be0a70a45fdaef761db134b900 (diff) | |
| download | linux-0b936e37df8111ea727263a5a246b58e05b7aa1b.tar.gz linux-0b936e37df8111ea727263a5a246b58e05b7aa1b.tar.bz2 linux-0b936e37df8111ea727263a5a246b58e05b7aa1b.zip | |
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: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 547308a5ec6f..26c5d63cfc3d 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -590,16 +590,9 @@ void nfs_readdir_free_pagearray(struct page **pages, unsigned int npages) 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 - * to nfs_readdir_free_large_page + * to nfs_readdir_free_pagearray */ static int nfs_readdir_large_page(struct page **pages, unsigned int npages) @@ -623,7 +616,6 @@ static int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, struct inode *inode) { struct page *pages[NFS_MAX_READDIR_PAGES]; - void *pages_ptr = NULL; struct nfs_entry entry; struct file *file = desc->file; struct nfs_cache_array *array; @@ -671,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_large_page(pages_ptr, pages, array_size); + nfs_readdir_free_pagearray(pages, array_size); out_release_array: nfs_readdir_release_array(page); out_label_free: |