From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6829AC25B08 for ; Mon, 15 Aug 2022 18:56:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3F8B8E0002; Mon, 15 Aug 2022 14:56:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC82B8E0001; Mon, 15 Aug 2022 14:56:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D42558E0002; Mon, 15 Aug 2022 14:56:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C3CB48E0001 for ; Mon, 15 Aug 2022 14:56:04 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9761C40EFB for ; Mon, 15 Aug 2022 18:56:04 +0000 (UTC) X-FDA: 79802731848.06.C594AA4 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf11.hostedemail.com (Postfix) with ESMTP id D150540015 for ; Mon, 15 Aug 2022 18:56:03 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id f28so7353061pfk.1 for ; Mon, 15 Aug 2022 11:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=EVNfKk5ZAzp2gPep1Yofo/UzU1m6EYLq8voCf56STj8=; b=M8IZIk7Jp8250xvZqGSMpvSUeZ3dvuFn3bLOlwIQycHml+YrzlnYk0wuRdVtsm8HzU bvV65mni8k2mo/XT9hYMsHRILCfrChluFWNGS/L4GOgJ3HhjZGjaAydrW7Z+ztq40Egv 3wDl0SMEYJ2Fy/s4RzU0l1aGaYxJMmiBfcHn4FhsVr4s7NJVUw6ov8jHJZrpyd8vArg0 c7Ko09i20UU7E/MjJRaWpiaq4u0vVa0I+rSEomiRhlwa/sFcyD/BE093QgNiriTA2ki7 vz5yVxU4u1BU6qGKeJnATjpNPSjpB+ezcTUrbIiPkqD4tjBgq9e+1Ui3xXrJ+vmpSBN6 LlKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=EVNfKk5ZAzp2gPep1Yofo/UzU1m6EYLq8voCf56STj8=; b=f1gk5B8+iTQ1YHXWjBKZA4iEaJb7vdF+K1GdQAflMf0DVEhODITXLGb3QxqZC4tIRw UHXeAdmwNugNOypqcNgK5hrijIRnLUHczlcc/oExFIaC4oCXQlOTZ91tLO3C8GkQQAff nK3opdi/K753Z2rVAvHo8fMYtxFlY60MhPRR2fYNFvDOPU6EIF6Y2T5hJxfjSfoXMKVJ 0awNb6cnVyELNOWWCqo3z49S8h3Vf/stRa2NE+Ydrc54e6SayMR6FofZK8c5/2v77gx4 79GcDXoAnV0OuL46DVvQIF9ZlM5Ou0HTMK/bJcWgfTk5qOkVXxwIMaT8Jz9h9PQh6Fs8 vDCA== X-Gm-Message-State: ACgBeo29IDVulQw5fmAa51TeTRAVKeoFakFs1Gs4ALCLZeR5ZHAig2Eu trhFvT3Alqu5qM96hJ2b0Jg= X-Google-Smtp-Source: AA6agR5AZjMZG0XiC1/OQks2+/viJeEXuejuN52kw77RNDFEYI4CLvS7tEmJitupYm81daGL/6HH6A== X-Received: by 2002:a63:1342:0:b0:422:5e7a:2a8f with SMTP id 2-20020a631342000000b004225e7a2a8fmr13035811pgt.425.1660589762829; Mon, 15 Aug 2022 11:56:02 -0700 (PDT) Received: from vmfolio.. (c-73-189-111-8.hsd1.ca.comcast.net. [73.189.111.8]) by smtp.googlemail.com with ESMTPSA id x190-20020a6231c7000000b0052def2e20dasm6858174pfx.167.2022.08.15.11.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 11:56:02 -0700 (PDT) From: "Vishal Moola (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH 5/7] nilfs2: Convert nilfs_find_uncommited_extent() to use filemap_get_folios_contig() Date: Mon, 15 Aug 2022 11:54:50 -0700 Message-Id: <20220815185452.37447-6-vishal.moola@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220815185452.37447-1-vishal.moola@gmail.com> References: <20220815185452.37447-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660589764; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EVNfKk5ZAzp2gPep1Yofo/UzU1m6EYLq8voCf56STj8=; b=gZ6O30wTc02nIYMrS12vfCYzWNs7rbFaxis/EJ3TatfUfyhOm0quwG+seNBc4eb/dcnq0J kbo45GEcBmguaTWSG0rCpNruRUrDZCX6NP9iIn/4ow983vLCPmy0ToqaC9qHWlPztEi5r+ nxdOAXDB9ZXiuSXkJix0dWsUkYKr7dk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=M8IZIk7J; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660589764; a=rsa-sha256; cv=none; b=mNtrsXj6DKkZo21v5pRgIPd/CBjoWs7Kt1BUaotVPPoSrCJ6f/yLaHpM6Urna1TP10t8uu u7Q+mN6yMJqi4pBK1/LlvUHT32ff157TU+lcRWRnhFyXPgfuffyPVVr+oYvE1KqvC0D8i3 cY5BGDLtA+VxiM3HWI7rEKSjeN9ZWGA= Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=M8IZIk7J; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com X-Rspam-User: X-Stat-Signature: xx81dfukfr45nioybdustwy98u9ii9oz X-Rspamd-Queue-Id: D150540015 X-Rspamd-Server: rspam11 X-HE-Tag: 1660589763-801042 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Converted function to use folios throughout. This is in preparation for the removal of find_get_pages_contig(). Now also supports large folios. Also cleaned up an unnecessary if statement - pvec.pages[0]->index > index will always evaluate to false, and filemap_get_folios_contig() returns 0 if there is no folio found at index. Signed-off-by: Vishal Moola (Oracle) --- fs/nilfs2/page.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 3267e96c256c..40cc8eb0bc8e 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -480,13 +480,13 @@ unsigned long nilfs_find_uncommitted_extent(struct inode *inode, sector_t start_blk, sector_t *blkoff) { - unsigned int i; + unsigned int i, nr; pgoff_t index; unsigned int nblocks_in_page; unsigned long length = 0; sector_t b; - struct pagevec pvec; - struct page *page; + struct folio_batch fbatch; + struct folio *folio; if (inode->i_mapping->nrpages == 0) return 0; @@ -494,27 +494,24 @@ unsigned long nilfs_find_uncommitted_extent(struct inode *inode, index = start_blk >> (PAGE_SHIFT - inode->i_blkbits); nblocks_in_page = 1U << (PAGE_SHIFT - inode->i_blkbits); - pagevec_init(&pvec); + folio_batch_init(&fbatch); repeat: - pvec.nr = find_get_pages_contig(inode->i_mapping, index, PAGEVEC_SIZE, - pvec.pages); - if (pvec.nr == 0) + nr = filemap_get_folios_contig(inode->i_mapping, &index, ULONG_MAX, + &fbatch); + if (nr == 0) return length; - if (length > 0 && pvec.pages[0]->index > index) - goto out; - - b = pvec.pages[0]->index << (PAGE_SHIFT - inode->i_blkbits); + b = fbatch.folios[0]->index << (PAGE_SHIFT - inode->i_blkbits); i = 0; do { - page = pvec.pages[i]; + folio = fbatch.folios[i]; - lock_page(page); - if (page_has_buffers(page)) { + folio_lock(folio); + if (folio_buffers(folio)) { struct buffer_head *bh, *head; - bh = head = page_buffers(page); + bh = head = folio_buffers(folio); do { if (b < start_blk) continue; @@ -532,18 +529,17 @@ unsigned long nilfs_find_uncommitted_extent(struct inode *inode, b += nblocks_in_page; } - unlock_page(page); + folio_unlock(folio); - } while (++i < pagevec_count(&pvec)); + } while (++i < nr); - index = page->index + 1; - pagevec_release(&pvec); + folio_batch_release(&fbatch); cond_resched(); goto repeat; out_locked: - unlock_page(page); + folio_unlock(folio); out: - pagevec_release(&pvec); + folio_batch_release(&fbatch); return length; } -- 2.36.1