From patchwork Mon Feb 21 16:08:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 12753869 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AB58C433EF for ; Mon, 21 Feb 2022 16:17:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379977AbiBUQPb (ORCPT ); Mon, 21 Feb 2022 11:15:31 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:40078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379988AbiBUQP1 (ORCPT ); Mon, 21 Feb 2022 11:15:27 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A160D275E4 for ; Mon, 21 Feb 2022 08:15:03 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 59F4DB81258 for ; Mon, 21 Feb 2022 16:15:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9CCDC36AE2 for ; Mon, 21 Feb 2022 16:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645460101; bh=WUn9Vl/8MYcUOyEsRTWTJrdUM82S7jYrK+BZMYFlQOE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VQprGTr1F/lhq0RkUbiu/v005puxQASIzyC1fV+hROwVqwMeVyU2f/8qmBVBYfple SujcfMAIiuBjp3m9MvxznjYNB0f7n2pro7wq+ttcPYyZI/ICf7sCWz/b4JUFxV+Mqx piWBUcf9sIRy90qfFpsnRNOCTuLIC+oZ5dwNAzu/Ot3fP7uQQLzwYB43WMFCxb00sx UoXd59PsveX4bas/WKVJfPohr8NzS47cpnzB6gg7sif7ylsY/lzrK4RZqJlYuNoqVu pQhvKjnig2ojab2WOAFTXbh32yaYyyZcNtFK8rBAkCKkHNN32aNmF19lCQDWPpng9y sujTDdOmXga4A== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Subject: [PATCH v6 04/13] NFS: Simplify nfs_readdir_xdr_to_array() Date: Mon, 21 Feb 2022 11:08:42 -0500 Message-Id: <20220221160851.15508-5-trondmy@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221160851.15508-4-trondmy@kernel.org> References: <20220221160851.15508-1-trondmy@kernel.org> <20220221160851.15508-2-trondmy@kernel.org> <20220221160851.15508-3-trondmy@kernel.org> <20220221160851.15508-4-trondmy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust 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 --- 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 c84a3bbda216..a7f25fef890a 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);