From: trondmy@gmail.com
To: linux-nfs@vger.kernel.org
Subject: [PATCH v5 2/6] NFS: Simplify nfs_readdir_xdr_to_array()
Date: Fri, 18 Feb 2022 16:24:20 -0500 [thread overview]
Message-ID: <20220218212424.1840077-3-trond.myklebust@hammerspace.com> (raw)
In-Reply-To: <20220218212424.1840077-2-trond.myklebust@hammerspace.com>
From: Trond Myklebust <trond.myklebust@hammerspace.com>
Recent changes to readdir mean that we can cope with partially filled
page cache entries, so we no longer need to rely on looping in
nfs_readdir_xdr_to_array().
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
fs/nfs/dir.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index b0ee3a0e0f81..10421b5331ca 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -864,6 +864,7 @@ static int nfs_readdir_xdr_to_array(struct nfs_readdir_descriptor *desc,
size_t array_size;
struct inode *inode = file_inode(desc->file);
unsigned int dtsize = desc->dtsize;
+ unsigned int pglen;
int status = -ENOMEM;
entry = kzalloc(sizeof(*entry), GFP_KERNEL);
@@ -881,28 +882,20 @@ static int nfs_readdir_xdr_to_array(struct nfs_readdir_descriptor *desc,
if (!pages)
goto out;
- do {
- unsigned int pglen;
- status = nfs_readdir_xdr_filler(desc, verf_arg, entry->cookie,
- pages, dtsize,
- verf_res);
- if (status < 0)
- break;
-
- pglen = status;
- if (pglen == 0) {
- nfs_readdir_page_set_eof(page);
- break;
- }
-
- verf_arg = verf_res;
+ status = nfs_readdir_xdr_filler(desc, verf_arg, entry->cookie, pages,
+ dtsize, verf_res);
+ if (status < 0)
+ goto free_pages;
+ pglen = status;
+ if (pglen != 0)
status = nfs_readdir_page_filler(desc, entry, pages, pglen,
arrays, narrays);
- desc->buffer_fills++;
- } while (!status && nfs_readdir_page_needs_filling(page) &&
- page_mapping(page));
+ else
+ nfs_readdir_page_set_eof(page);
+ desc->buffer_fills++;
+free_pages:
nfs_readdir_free_pages(pages, array_size);
out:
nfs_free_fattr(entry->fattr);
--
2.35.1
next prev parent reply other threads:[~2022-02-18 21:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 21:24 [PATCH v5 0/6] Readdir improvements trondmy
2022-02-18 21:24 ` [PATCH v5 1/6] NFS: Adjust the amount of readahead performed by NFS readdir trondmy
2022-02-18 21:24 ` trondmy [this message]
2022-02-18 21:24 ` [PATCH v5 3/6] NFS: Improve algorithm for falling back to uncached readdir trondmy
2022-02-18 21:24 ` [PATCH v5 4/6] NFS: Improve heuristic for readdirplus trondmy
2022-02-18 21:24 ` [PATCH v5 5/6] NFS: Don't ask for readdirplus unless it can help nfs_getattr() trondmy
2022-02-18 21:24 ` [PATCH v5 6/6] NFSv4: Ask for a full XDR buffer of readdir goodness trondmy
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=20220218212424.1840077-3-trond.myklebust@hammerspace.com \
--to=trondmy@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.