From patchwork Tue Nov 14 08:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727822vqg; Tue, 14 Nov 2023 00:47:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlKOW80UlAmN7n2shfEypR56ETCRdwOP3NatvaZ2yeU/93oVPgwDu3Pza+GUmGGBjw8fHI X-Received: by 2002:a05:6358:338c:b0:16b:a9f5:cde0 with SMTP id i12-20020a056358338c00b0016ba9f5cde0mr2189254rwd.29.1699951674607; Tue, 14 Nov 2023 00:47:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951674; cv=none; d=google.com; s=arc-20160816; b=JAmk7HN1+67vKl42/m/sknecFm1eGOD814e+bTe7IYRBgdn/1xGMIhSWhdjhEwhyiT zSckZcSH2fmkq1ONb6H5J6QBDCb5aBW0EZvq5lmVS2fpp7k4jIZ0NIVIW9ir1+EsKt4L MNLsW/fIiQVT8iea/5x7PxXQ5rtpy+9ds5C8A4Nv4yVsmFmVwyBIuqdp5FN2X9L0TXeX DwmdVhdOJcKLLGLbHI4WACLzNW+STlrRWU6DyN/LM2IiKD+lECOc0q08SXLvyl2x2YhX pzoxNVhhNrxNKAjmklOwYqOvjh6Osz0NG8PzHK7sVx1J5OfSlA6ABv2wOcI41cb9rtxI WLfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EviPGa1LuLnC0+KfNNg7CsK+qd6t9X5DweSPa1hqKSw=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=lEBIeLIvFOjd+7L5p9Y4ygYClpHAlfxrN96rNxojdQ5hHaBLovMLyq3003GSE52i3b G8/XJUysWv45riumSLPJ7El1qXtrdo4l0UzKwrJfmxU8UTgiSQEJcu55Wu/jsJZQQP3j KBZIPZjUfmxvHNW9RE1tGiC1qJV8x9XpwwWbezUj2S83vRrE8kI2rIuYyIssFW5qWhc7 r2irayqKkyqN4veJKFm1jH5QuCQ2fzOp/lzQ0nkrrhWaEUOI5Hb/iZAyDGIxLmtnIrAZ V/K5XM/6tW1rgnXQOlw5D1XXdwbup5X4EpCr/4vV+aKcUAICBtE0btu2D6r8/is2a12E PmMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nfaNMqe2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id z9-20020a655a49000000b005b90af1943asi7828212pgs.807.2023.11.14.00.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nfaNMqe2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id A09E48072A24; Tue, 14 Nov 2023 00:47:31 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232570AbjKNIqR (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232498AbjKNIqB (ORCPT ); Tue, 14 Nov 2023 03:46:01 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32B41A4; Tue, 14 Nov 2023 00:45:51 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6bee11456baso4572438b3a.1; Tue, 14 Nov 2023 00:45:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951551; x=1700556351; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EviPGa1LuLnC0+KfNNg7CsK+qd6t9X5DweSPa1hqKSw=; b=nfaNMqe2ce7ZdK9sMCxgmLjRywnB0lFVHldlnrAe8+qaMg1sIgxRtwjutw+lU1pt+N ydrdGY6bTudLyqjXBnMoM2KHisnfSCpFF5uItaWDQHsL7laicwgaFxjK5NXKnx2YQGVa VGR6O+BzQ5KXsFJHaAfDKmlESDw8Mm/4S05+S3dUJtacxQnm6cPDcAVzSj23FDTv8eXL AH80PqtQpfZsg9mIV9zOB6ff1E0o3qsopkYy2maQDUpDDX6cMS0bvk98NWh3kSaSL/sO tH40xfNdCcQPGcx2GieZdXisv+lxbvXOC6++TLS3gj3x0H3IuMf1f9etwUQr9I8kNDNT BC9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951551; x=1700556351; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EviPGa1LuLnC0+KfNNg7CsK+qd6t9X5DweSPa1hqKSw=; b=Il3NK1V4YbIYqj9TD85AWVRIvKfzjhrpHumedAyma27vvJlMobyoKSBu0Ni/1DL9mm hlyHiw3YuvPAY4PnqiVyp7zMt1T3BIeOyVHXVjxQvmvPMbXIMdKq9O0R7LPuTJFKoD59 KTj2Dm8PzZAwBnRPt6El+B7YGF/ysbdDLqqNxOAPtKTgOAabwK3VSvslwYUYMIaRtmoV iqBf2l8cu/jXIfwDW4Ejp0Piew/4oMA9rWFkiRHogK+jQsr8Q626ifui3DpI7BlAhga/ xrDMoXuxrd6XKOBaFGxZiM80pTpZZfvpYVr86WHoUq6SYqldcTTQQ2zUJe/5nAwjaCdj afXw== X-Gm-Message-State: AOJu0YwlnxEg4dXd1z3su2t/BuRqzOlyV4b5tiaPL/wAH9BC/wadpgam 2M7OqjKwVpqaofs9jEVdggzyYSqODkM= X-Received: by 2002:aa7:8184:0:b0:68e:496a:7854 with SMTP id g4-20020aa78184000000b0068e496a7854mr5991985pfi.18.1699951551295; Tue, 14 Nov 2023 00:45:51 -0800 (PST) Received: from carrot.. (i223-218-133-131.s42.a014.ap.plala.or.jp. [223.218.133.131]) by smtp.gmail.com with ESMTPSA id u17-20020a056a00159100b006c4d2479c1asm748083pfk.219.2023.11.14.00.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:50 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 10/20] nilfs2: Convert nilfs_segctor_prepare_write to use folios Date: Tue, 14 Nov 2023 17:44:26 +0900 Message-Id: <20231114084436.2755-11-konishi.ryusuke@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114084436.2755-1-konishi.ryusuke@gmail.com> References: <20231114084436.2755-1-konishi.ryusuke@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:47:31 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528527152566020 X-GMAIL-MSGID: 1782528527152566020 From: "Matthew Wilcox (Oracle)" Use the new folio APIs, saving 17 hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/segment.c | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 8c675c118c66..52995838f2de 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -1665,39 +1665,39 @@ static int nilfs_segctor_assign(struct nilfs_sc_info *sci, int mode) return 0; } -static void nilfs_begin_page_io(struct page *page) +static void nilfs_begin_folio_io(struct folio *folio) { - if (!page || PageWriteback(page)) + if (!folio || folio_test_writeback(folio)) /* * For split b-tree node pages, this function may be called * twice. We ignore the 2nd or later calls by this check. */ return; - lock_page(page); - clear_page_dirty_for_io(page); - set_page_writeback(page); - unlock_page(page); + folio_lock(folio); + folio_clear_dirty_for_io(folio); + folio_start_writeback(folio); + folio_unlock(folio); } static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) { struct nilfs_segment_buffer *segbuf; - struct page *bd_page = NULL, *fs_page = NULL; + struct folio *bd_folio = NULL, *fs_folio = NULL; list_for_each_entry(segbuf, &sci->sc_segbufs, sb_list) { struct buffer_head *bh; list_for_each_entry(bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) { - if (bh->b_page != bd_page) { - if (bd_page) { - lock_page(bd_page); - clear_page_dirty_for_io(bd_page); - set_page_writeback(bd_page); - unlock_page(bd_page); + if (bh->b_folio != bd_folio) { + if (bd_folio) { + folio_lock(bd_folio); + folio_clear_dirty_for_io(bd_folio); + folio_start_writeback(bd_folio); + folio_unlock(bd_folio); } - bd_page = bh->b_page; + bd_folio = bh->b_folio; } } @@ -1705,28 +1705,28 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci) b_assoc_buffers) { set_buffer_async_write(bh); if (bh == segbuf->sb_super_root) { - if (bh->b_page != bd_page) { - lock_page(bd_page); - clear_page_dirty_for_io(bd_page); - set_page_writeback(bd_page); - unlock_page(bd_page); - bd_page = bh->b_page; + if (bh->b_folio != bd_folio) { + folio_lock(bd_folio); + folio_clear_dirty_for_io(bd_folio); + folio_start_writeback(bd_folio); + folio_unlock(bd_folio); + bd_folio = bh->b_folio; } break; } - if (bh->b_page != fs_page) { - nilfs_begin_page_io(fs_page); - fs_page = bh->b_page; + if (bh->b_folio != fs_folio) { + nilfs_begin_folio_io(fs_folio); + fs_folio = bh->b_folio; } } } - if (bd_page) { - lock_page(bd_page); - clear_page_dirty_for_io(bd_page); - set_page_writeback(bd_page); - unlock_page(bd_page); + if (bd_folio) { + folio_lock(bd_folio); + folio_clear_dirty_for_io(bd_folio); + folio_start_writeback(bd_folio); + folio_unlock(bd_folio); } - nilfs_begin_page_io(fs_page); + nilfs_begin_folio_io(fs_folio); } static int nilfs_segctor_write(struct nilfs_sc_info *sci,