From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: <Trond.Myklebust@primarydata.com>, <linux-nfs@vger.kernel.org>
Cc: <Anna.Schumaker@netapp.com>
Subject: [PATCH 2/9] NFS: Rename nfs_readdir_free_pagearray() and nfs_readdir_large_page()
Date: Fri, 10 Jul 2015 16:58:10 -0400 [thread overview]
Message-ID: <1436561897-8051-3-git-send-email-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <1436561897-8051-1-git-send-email-Anna.Schumaker@Netapp.com>
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: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
fs/nfs/dir.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index ecb8ed5..c722212 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -583,7 +583,7 @@ out_nopages:
}
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:
--
2.4.5
next prev parent reply other threads:[~2015-07-10 21:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 20:58 [PATCH 0/9] NFS: Clean up unnecessary functions Anna Schumaker
2015-07-10 20:58 ` [PATCH 1/9] NFS: Remove unused variable "pages_ptr" Anna Schumaker
2015-07-13 6:59 ` Christoph Hellwig
2015-07-10 20:58 ` Anna Schumaker [this message]
2015-07-13 6:59 ` [PATCH 2/9] NFS: Rename nfs_readdir_free_pagearray() and nfs_readdir_large_page() Christoph Hellwig
2015-07-10 20:58 ` [PATCH 3/9] SUNRPC: Drop double-underscores from rpc_cmp_addr{4|6}() Anna Schumaker
2015-07-13 7:00 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 4/9] NFS: Use RPC functions for matching sockaddrs Anna Schumaker
2015-07-13 7:03 ` Christoph Hellwig
2015-07-13 13:56 ` Anna Schumaker
2015-07-13 14:21 ` Anna Schumaker
2015-07-13 14:32 ` Chuck Lever
2015-07-13 14:49 ` Anna Schumaker
2015-07-10 20:58 ` [PATCH 5/9] NFS: Combine nfs_idmap_{init|quit}() and nfs_idmap_{init|quit}_keyring() Anna Schumaker
2015-07-13 7:03 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 6/9] NFS: Remove nfs4_match_stateid() Anna Schumaker
2015-07-13 7:03 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 7/9] NFS: Remove nfs41_server_notify_{target|highest}_slotid_update() Anna Schumaker
2015-07-13 7:04 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 8/9] NFS: Rename nfs_commit_unstable_pages() to nfs_write_inode() Anna Schumaker
2015-07-13 7:04 ` Christoph Hellwig
2015-07-10 20:58 ` [PATCH 9/9] NFS: Remove nfs_release() Anna Schumaker
2015-07-13 7:04 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436561897-8051-3-git-send-email-Anna.Schumaker@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=Trond.Myklebust@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox