From patchwork Tue Nov 14 08:44:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164764 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727798vqg; Tue, 14 Nov 2023 00:47:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEoosiMm7LNji2QbOnDKQQBe+npexR3SMgYG/EAvnn5HEiQkEyT9Vi+ubowg0g2jp/Wg49w X-Received: by 2002:a05:6870:4e0c:b0:1f4:88cd:5ee3 with SMTP id pl12-20020a0568704e0c00b001f488cd5ee3mr13118259oab.27.1699951670398; Tue, 14 Nov 2023 00:47:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951670; cv=none; d=google.com; s=arc-20160816; b=EpnHp2VnYjz8O+HyoklWrOQop1+DTBeiEOScD9LPehZT53cqCaTEvBW+OYQlIU44gZ lzebFQntgahYI3ZiABumouR899AuZior89jMXS/5zShCTk0r9E371n8gqEY/q3tIQH0d Bg8b28gqZ9b0BLBmnPpDdhJvqFUQOVK92PF+/hdo7sDgxovKqSrzvZsEpci1Dn3CWe9f jUNBo72KmNUaP7sI54z/dNNvtChHf/nnzWiYXTe8uh+tJq45gPM3Wk6ANd4bZTFsPD6G RRiyoQi1Hc3k479u7E6aX6gS0T2FTnC7aSjIBvaMiplMMvdzlMuIK16bYVO5X2fRt85x sfpg== 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=DYBrKD//Fwh/NYZY8hEC83Yv0uKXYu3iL+h8zoNblA8=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=rPTGH7uJhPxeLyhU3gmwWF3y8/EFN3M6ebD2kA50yQTh8kvLrA9rpw+lVf9J82mSPW 9uMCXE9K0ZfFV/AnmhN0EGzKn5NLuiZHRn3AJiw4Hi3DB/uBg4e5b01vM3I9CPG6RBMT mqru8qt+a/Kzg6AybdWmOJE+viGGMDilh248g8aulHSwWxjHQd3/R4MHmph6AKZDzfaN 54yC+9lcl7DKkya6p1d2s9s/0kEuRuXtCvkjECgAfMUJhiAZwzjEmmG9qDWNbKIf5r2+ H72s2ez4BstPTdVAJHfpyiNBPe5f4BhXMD+rVsQM+GZD4KXm8X9HsK353JcyhZPCnECf ZJCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jSiuoen5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b6-20020a056a000a8600b006b6efb7f99fsi7845483pfl.280.2023.11.14.00.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jSiuoen5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 04F868095026; Tue, 14 Nov 2023 00:46:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232546AbjKNIqH (ORCPT + 30 others); Tue, 14 Nov 2023 03:46:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232395AbjKNIpu (ORCPT ); Tue, 14 Nov 2023 03:45:50 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 336E0D4D; Tue, 14 Nov 2023 00:45:46 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6c34e87b571so4448529b3a.3; Tue, 14 Nov 2023 00:45:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951545; x=1700556345; 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=DYBrKD//Fwh/NYZY8hEC83Yv0uKXYu3iL+h8zoNblA8=; b=jSiuoen5cbGc0b5p0FsLgVqL1+1WNb3Wo8lERYUAY0YW1kOulucBZNJLZuanBdo4mu 2N2rP7SvfV8x0/PKR9I+s9gnUWQ99g/Wi1P1z9dyQ+SXjrke5+DiV7x+yk+QWvj0Edsi vmYOpQbSBVRO0rwa5EDq37+6slPRVPbRA5ZcYsBx3mPNBopRu5JlfYCyf60n4nsZKvXz qW0sa0t5/7gs8gDMLS2/sDHJMMQhTF05oTGiSOtZ+gccBAGT6tNCVR6uuYL+XCekT+Pg ndaRsKyJco3yK4Do0n4TalSV2TP4XhRTdwau9GPF32agpWnbhPkf6eBWQYcb5cZOZfqa 3viA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951545; x=1700556345; 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=DYBrKD//Fwh/NYZY8hEC83Yv0uKXYu3iL+h8zoNblA8=; b=pAGgANwa99GBn0+/eXRNgmBbqzJftAK6I6CQAOPP8cA/SIIi8UCitHI1E7MVTbyvq7 S6LJ/mQcmf3mC9Z7UFq+Z9klxgMq1I+kolyl5v8PH7AURcsBeGIf26oWqIj6BJSlsaoN OqFYSPAkV/L5t1y5Yu3izmyjc0ehjiyuCxR2EB/x0IZKwlQh0WA2PrIbpcKrwQY2N/2s d7/aOfgyAL2nxa9hxkk8ixpLLLbSu1rs8dHDcWdMnLYznxdSSB582pXlZwClfHvAz1C0 tZG400kvoXASY5vjBU0YPLZRUPng5jC5rS2D9N3MbpaUM+cMMgaUMxU+deyQqG+7q8kD lsiQ== X-Gm-Message-State: AOJu0YxLwIAYarhbPmPCtHWELWUq8q5Ry27U1+W9v3j4VYioDpGxJStO gZi2Z5QKzFgSdC4T9p+CPpg= X-Received: by 2002:a05:6a00:230f:b0:6be:22db:7a13 with SMTP id h15-20020a056a00230f00b006be22db7a13mr8655258pfh.25.1699951545636; Tue, 14 Nov 2023 00:45:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:45 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 07/20] nilfs2: Convert nilfs_mdt_write_page() to use a folio Date: Tue, 14 Nov 2023 17:44:23 +0900 Message-Id: <20231114084436.2755-8-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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 00:46:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528523025322089 X-GMAIL-MSGID: 1782528523025322089 From: "Matthew Wilcox (Oracle)" Convert the incoming page to a folio. Replaces three calls to compound_head() with one. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/mdt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index c97c77a39668..327408512b86 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -399,7 +399,8 @@ int nilfs_mdt_fetch_dirty(struct inode *inode) static int nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc) { - struct inode *inode = page->mapping->host; + struct folio *folio = page_folio(page); + struct inode *inode = folio->mapping->host; struct super_block *sb; int err = 0; @@ -407,16 +408,16 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc) /* * It means that filesystem was remounted in read-only * mode because of error or metadata corruption. But we - * have dirty pages that try to be flushed in background. - * So, here we simply discard this dirty page. + * have dirty folios that try to be flushed in background. + * So, here we simply discard this dirty folio. */ nilfs_clear_dirty_page(page, false); - unlock_page(page); + folio_unlock(folio); return -EROFS; } - redirty_page_for_writepage(wbc, page); - unlock_page(page); + folio_redirty_for_writepage(wbc, folio); + folio_unlock(folio); if (!inode) return 0;