From: "Benjamin Coddington" <bcodding@redhat.com>
To: trondmy@kernel.org
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH 03/12] NFS: Clean up nfs_readdir_page_filler()
Date: Tue, 03 Nov 2020 09:24:44 -0500 [thread overview]
Message-ID: <46951701-9996-4625-ABD1-E516549C728E@redhat.com> (raw)
In-Reply-To: <36E36AEF-E3D3-472B-A837-FF1312B7C169@redhat.com>
On 3 Nov 2020, at 9:18, Benjamin Coddington wrote:
> On 2 Nov 2020, at 13:06, trondmy@kernel.org wrote:
>
>> From: Trond Myklebust <trond.myklebust@hammerspace.com>
>>
>> Clean up handling of the case where there are no entries in the
>> readdir
>> reply.
>>
>> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
>> ---
>> fs/nfs/dir.c | 39 ++++++++++++++++++---------------------
>> 1 file changed, 18 insertions(+), 21 deletions(-)
>>
>> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
>> index 604ebe015387..68acbde3f914 100644
>> --- a/fs/nfs/dir.c
>> +++ b/fs/nfs/dir.c
>> @@ -601,16 +601,12 @@ int
>> nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct
>> nfs_entry *en
>> struct xdr_stream stream;
>> struct xdr_buf buf;
>> struct page *scratch;
>> - unsigned int count = 0;
>> int status;
>>
>> scratch = alloc_page(GFP_KERNEL);
>> if (scratch == NULL)
>> return -ENOMEM;
>>
>> - if (buflen == 0)
>> - goto out_nopages;
>> -
>> xdr_init_decode_pages(&stream, &buf, xdr_pages, buflen);
>> xdr_set_scratch_buffer(&stream, page_address(scratch), PAGE_SIZE);
>>
>> @@ -619,27 +615,27 @@ int
>> nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct
>> nfs_entry *en
>> entry->label->len = NFS4_MAXLABELLEN;
>>
>> status = xdr_decode(desc, entry, &stream);
>> - if (status != 0) {
>> - if (status == -EAGAIN)
>> - status = 0;
>> + if (status != 0)
>> break;
>> - }
>> -
>> - count++;
>>
>> if (desc->plus)
>> nfs_prime_dcache(file_dentry(desc->file), entry,
>> desc->dir_verifier);
>>
>> status = nfs_readdir_add_to_array(entry, page);
>> - if (status != 0)
>> - break;
>> - } while (!entry->eof);
>> + } while (!status && !entry->eof);
>>
>> -out_nopages:
>> - if (count == 0 || (status == -EBADCOOKIE && entry->eof != 0)) {
>> - nfs_readdir_page_set_eof(page);
>> + switch (status) {
>> + case -EBADCOOKIE:
>> + if (entry->eof) {
>> + nfs_readdir_page_set_eof(page);
>> + status = 0;
>> + }
>> + break;
>> + case -ENOSPC:
>
> If you return ENOSPC, then you don't need to use
> nfs_readdir_array_is_full(array) below..
>
>> + case -EAGAIN:
>> status = 0;
>> + break;
>> }
>>
>> put_page(scratch);
>> @@ -714,14 +710,15 @@ int
>> nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page
>> *page,
>>
>> if (status < 0)
>> break;
>> +
>> pglen = status;
>> - status = nfs_readdir_page_filler(desc, &entry, pages, page,
>> pglen);
>> - if (status < 0) {
>> - if (status == -ENOSPC)
>> - status = 0;
>> + if (pglen == 0) {
>> + nfs_readdir_page_set_eof(page);
>> break;
>> }
>> - } while (!nfs_readdir_array_is_full(array));
>> +
>> + status = nfs_readdir_page_filler(desc, &entry, pages, page,
>> pglen);
>> + } while (!status && !nfs_readdir_array_is_full(array));
>
> ^^ here.
>
> I suppose nfs_readdir_array_is_full() is nice and clear.. I wonder if
> the
> compiler would optimize it away.
Ah, I see now -- the check handles the case of eof as well..
I suppose I shouldn't send a stream of consciousness to the list. Sorry
about that.
Ben
next prev parent reply other threads:[~2020-11-03 14:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 18:06 [PATCH 00/12] Readdir enhancements trondmy
2020-11-02 18:06 ` [PATCH 01/12] NFS: Ensure contents of struct nfs_open_dir_context are consistent trondmy
2020-11-02 18:06 ` [PATCH 02/12] NFS: Clean up readdir struct nfs_cache_array trondmy
2020-11-02 18:06 ` [PATCH 03/12] NFS: Clean up nfs_readdir_page_filler() trondmy
2020-11-02 18:06 ` [PATCH 04/12] NFS: Clean up directory array handling trondmy
2020-11-02 18:06 ` [PATCH 05/12] NFS: Don't discard readdir results trondmy
2020-11-02 18:06 ` [PATCH 06/12] NFS: Remove unnecessary kmap in nfs_readdir_xdr_to_array() trondmy
2020-11-02 18:06 ` [PATCH 07/12] NFS: Replace kmap() with kmap_atomic() in nfs_readdir_search_array() trondmy
2020-11-02 18:06 ` [PATCH 08/12] NFS: Simplify struct nfs_cache_array_entry trondmy
2020-11-02 18:06 ` [PATCH 09/12] NFS: Support larger readdir buffers trondmy
2020-11-02 18:06 ` [PATCH 10/12] NFS: More readdir cleanups trondmy
2020-11-02 18:06 ` [PATCH 11/12] NFS: nfs_do_filldir() does not return a value trondmy
2020-11-02 18:06 ` [PATCH 12/12] NFS: Reduce readdir stack usage trondmy
2020-11-03 14:18 ` [PATCH 03/12] NFS: Clean up nfs_readdir_page_filler() Benjamin Coddington
2020-11-03 14:24 ` Benjamin Coddington [this message]
2020-11-03 13:35 ` [PATCH 02/12] NFS: Clean up readdir struct nfs_cache_array Benjamin Coddington
2020-11-03 14:09 ` Benjamin Coddington
2020-11-03 14:34 ` Benjamin Coddington
2020-11-02 20:40 ` [PATCH 00/12] Readdir enhancements David Wysochanski
2020-11-02 21:32 ` Trond Myklebust
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=46951701-9996-4625-ABD1-E516549C728E@redhat.com \
--to=bcodding@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trondmy@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;
as well as URLs for NNTP newsgroup(s).