From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH v2 06/16] NFS: Remove unnecessary kmap in nfs_readdir_xdr_to_array() Date: Tue, 3 Nov 2020 10:33:19 -0500 Message-ID: <20201103153329.531942-7-trondmy@kernel.org> (raw) In-Reply-To: <20201103153329.531942-6-trondmy@kernel.org> From: Trond Myklebust <trond.myklebust@hammerspace.com> The kmapped pointer is only used once per loop to check if we need to exit. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> --- fs/nfs/dir.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 788c2a2eeaa3..ba3521dcd0c8 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -760,7 +760,6 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, struct page *pages[NFS_MAX_READDIR_PAGES]; struct nfs_entry entry; struct file *file = desc->file; - struct nfs_cache_array *array; int status = -ENOMEM; unsigned int array_size = ARRAY_SIZE(pages); @@ -779,11 +778,9 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, goto out; } - array = kmap(page); - status = nfs_readdir_alloc_pages(pages, array_size); if (status < 0) - goto out_release_array; + goto out_release_label; do { unsigned int pglen; status = nfs_readdir_xdr_filler(pages, desc, &entry, file, inode); @@ -798,11 +795,10 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, } status = nfs_readdir_page_filler(desc, &entry, pages, page, pglen); - } while (!status && !nfs_readdir_array_is_full(array)); + } while (!status && nfs_readdir_page_needs_filling(page)); nfs_readdir_free_pages(pages, array_size); -out_release_array: - kunmap(page); +out_release_label: nfs4_label_free(entry.label); out: nfs_free_fattr(entry.fattr); -- 2.28.0
next prev parent reply index Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-03 15:33 [PATCH v2 00/16] Readdir enhancements trondmy 2020-11-03 15:33 ` [PATCH v2 01/16] NFS: Ensure contents of struct nfs_open_dir_context are consistent trondmy 2020-11-03 15:33 ` [PATCH v2 02/16] NFS: Clean up readdir struct nfs_cache_array trondmy 2020-11-03 15:33 ` [PATCH v2 03/16] NFS: Clean up nfs_readdir_page_filler() trondmy 2020-11-03 15:33 ` [PATCH v2 04/16] NFS: Clean up directory array handling trondmy 2020-11-03 15:33 ` [PATCH v2 05/16] NFS: Don't discard readdir results trondmy 2020-11-03 15:33 ` trondmy [this message] 2020-11-03 15:33 ` [PATCH v2 07/16] NFS: Replace kmap() with kmap_atomic() in nfs_readdir_search_array() trondmy 2020-11-03 15:33 ` [PATCH v2 08/16] NFS: Simplify struct nfs_cache_array_entry trondmy 2020-11-03 15:33 ` [PATCH v2 09/16] NFS: Support larger readdir buffers trondmy 2020-11-03 15:33 ` [PATCH v2 10/16] NFS: More readdir cleanups trondmy 2020-11-03 15:33 ` [PATCH v2 11/16] NFS: nfs_do_filldir() does not return a value trondmy 2020-11-03 15:33 ` [PATCH v2 12/16] NFS: Reduce readdir stack usage trondmy 2020-11-03 15:33 ` [PATCH v2 13/16] NFS: Cleanup to remove nfs_readdir_descriptor_t typedef trondmy 2020-11-03 15:33 ` [PATCH v2 14/16] NFS: Allow the NFS generic code to pass in a verifier to readdir trondmy 2020-11-03 15:33 ` [PATCH v2 15/16] NFS: Handle NFS4ERR_NOT_SAME and NFSERR_BADCOOKIE from readdir calls trondmy 2020-11-03 15:33 ` [PATCH v2 16/16] NFS: Improve handling of directory verifiers trondmy 2020-11-04 10:12 ` Mkrtchyan, Tigran 2020-11-04 17:21 ` Trond Myklebust 2020-11-03 15:55 ` [PATCH v2 05/16] NFS: Don't discard readdir results Benjamin Coddington 2020-11-03 16:14 ` Trond Myklebust 2020-11-04 16:14 ` [PATCH v2 00/16] Readdir enhancements Benjamin Coddington 2020-11-04 17:04 ` Trond Myklebust 2020-11-04 17:19 ` Benjamin Coddington
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=20201103153329.531942-7-trondmy@kernel.org \ --to=trondmy@kernel.org \ --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
Linux-NFS Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \ linux-nfs@vger.kernel.org public-inbox-index linux-nfs Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs AGPL code for this site: git clone https://public-inbox.org/public-inbox.git