Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Anna Schumaker and committed by
Trond Myklebust
0b936e37 ce603281

+2 -10
+2 -10
fs/nfs/dir.c
··· 590 590 put_page(pages[i]); 591 591 } 592 592 593 - static 594 - void nfs_readdir_free_large_page(void *ptr, struct page **pages, 595 - unsigned int npages) 596 - { 597 - nfs_readdir_free_pagearray(pages, npages); 598 - } 599 - 600 593 /* 601 594 * nfs_readdir_large_page will allocate pages that must be freed with a call 602 - * to nfs_readdir_free_large_page 595 + * to nfs_readdir_free_pagearray 603 596 */ 604 597 static 605 598 int nfs_readdir_large_page(struct page **pages, unsigned int npages) ··· 616 623 int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, struct inode *inode) 617 624 { 618 625 struct page *pages[NFS_MAX_READDIR_PAGES]; 619 - void *pages_ptr = NULL; 620 626 struct nfs_entry entry; 621 627 struct file *file = desc->file; 622 628 struct nfs_cache_array *array; ··· 663 671 } 664 672 } while (array->eof_index < 0); 665 673 666 - nfs_readdir_free_large_page(pages_ptr, pages, array_size); 674 + nfs_readdir_free_pagearray(pages, array_size); 667 675 out_release_array: 668 676 nfs_readdir_release_array(page); 669 677 out_label_free: