From patchwork Tue Nov 14 08:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 164762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1727774vqg; Tue, 14 Nov 2023 00:47:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6DOGXDikxcZOa06r/CyoLEI03gH8Lf8wL2jGKPpVsRtJ77cSyLz83+gpHUXFLI96JXRIr X-Received: by 2002:a17:902:bf02:b0:1cc:6597:f40b with SMTP id bi2-20020a170902bf0200b001cc6597f40bmr1594300plb.36.1699951666144; Tue, 14 Nov 2023 00:47:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699951666; cv=none; d=google.com; s=arc-20160816; b=wUk1XhGeyQQHMD70STCWhOLr9izu6/lK0PFIDwyvGRvNwai5LL/gU/SaXn5KAjPDqN HzSRY/qA3fSdbo7vSdxHArRJVwtY9+13SPRjd8r0+GFXuQz6DqLTXiT2mrwZkV2QXy2Q E2CFQ4yODPuh372NOoYzKynY511JCSRtXBqvf+h11TSQMwxtQkpTifs4Qr/BGiDJICMJ VVmyzckRdklGykvHtbil8bEXSGZaShJD4AsO1WdBhRFzOyFkpkZVtCs07uCgx+BVWIHv 9eXXVyGD/7Lk5Mrd/uZJ81+5zMGjiFSrVI8/kGW9uwnGCjKbH8RrS8aI5T+jFjixbFtV ztTA== 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=OgKg2EOxZmZGIT91NGubi8L9VnRq79wrMG69PPwZDig=; fh=c4gLbwT9pvttlQWxFI2VesWIZ95B4IQ3bBh75IOono4=; b=EU47JTGj5jP738yjtLGhuDBBRGDGoUZR/vWemA0sMiNuDptZy8V+Qr6kW/8LXHhQW8 jl8ZoOGmEh3pstfKXlLXyc6r3szouxUBa8SbDtMOqiTPh2r34JpdsfzGJYkR2OfeX9nT 0mIwSgvrjRnX4LoIETX+38n47oFh6lwcA17C7yfP36ezYls5Yu1VnTTsx6VfOxvU3vYM fv4/GrDz9E7g8tYl0zTiPEKPZJMyiezN79ub5sny0N1rn6zzGHskUgk0n+aHoanF2LFa d02TidzTQD30d1JLDZ+gFHsafqE1FD036wYaWJ1T6n1323zFoqatXRXF44fzGqvUWiCw cydw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="LfuSs1/+"; 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 w13-20020a170902d3cd00b001c9faf1439esi7309892plb.288.2023.11.14.00.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:47:46 -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="LfuSs1/+"; 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 6C1BE8069D81; Tue, 14 Nov 2023 00:46:08 -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 S232454AbjKNIp5 (ORCPT + 30 others); Tue, 14 Nov 2023 03:45:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232410AbjKNIpn (ORCPT ); Tue, 14 Nov 2023 03:45:43 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 531EB1A8; Tue, 14 Nov 2023 00:45:40 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6be1bc5aa1cso5507494b3a.3; Tue, 14 Nov 2023 00:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699951540; x=1700556340; 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=OgKg2EOxZmZGIT91NGubi8L9VnRq79wrMG69PPwZDig=; b=LfuSs1/+ZMUH8Y68R6LMkE0FxVmSNB/C5HAwh15u5Ikx3J3neSpv/v1lOq+QmwRJQs zccIA/pjXoNVt9csPXNHFFVXMXwQ1k3W1zZbjWuxobPBxRy12u2/mndCDLutN32uist8 YEYP0c18Cgv0SZwhUWoj9HEX+4Fruxj1pErGzf6upNdAsab9NJgek3Lquug19vyCZ1fc RMzqJ1qK8IJW0MbHxpAhcLeHAETeEGOyWz/mCwuB384nTQuN8lLiThbyFO1WG8t/MmWq ZaVWrOSn8ABPP69oxDF0nWaPezWt+Xr87/O53PZEsM+70tcDRLTWwos2wNhByf28q3HL GuRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699951540; x=1700556340; 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=OgKg2EOxZmZGIT91NGubi8L9VnRq79wrMG69PPwZDig=; b=pY8v8GF+C/cLrrIoIuhFPaIC4D8xlXa1ynMjqtuXFS/e95BgQWQTSvZhN0t3UBxv9r 0zIofP2sPb7GoOeVDk4xUaRQcfnCHLhSSY2JBeXrvzXrYNZ/k2HnGaiNBDEo8TwPQg0T a86W8Jbb/h32XR/ekG+WfiFhdtaj1JySwpl8rhQSwT3TGHoCSmpWNLbwRE46ZjoKMPva 0XrwgHOP0gT05ydH7J9/LZjYijCsqzajM+PWd9Ve+OErIx6t5qRXeDjox/ngHyiwfz21 SOLuCoFhbGzj2+LVOy8gpgcRq696SH6IUMGFJcEQwDWx0Mk3JhPJzN48Y9x9Q1Oq/nCN RgoA== X-Gm-Message-State: AOJu0Yy3M/wN338lka4GtsYUxgZX4tvv0f/TE1AoL/gTS7liKlqUaM4b BgZf9lPQzpstVGTm7gkAMcnN0ZMnn58= X-Received: by 2002:a05:6a00:1d8d:b0:6c4:e7a0:af29 with SMTP id z13-20020a056a001d8d00b006c4e7a0af29mr10589103pfw.19.1699951539723; Tue, 14 Nov 2023 00:45:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 00:45:39 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 04/20] nilfs2: Convert nilfs_forget_buffer to use a folio Date: Tue, 14 Nov 2023 17:44:20 +0900 Message-Id: <20231114084436.2755-5-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_NONE,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:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782528517873031961 X-GMAIL-MSGID: 1782528517873031961 From: "Matthew Wilcox (Oracle)" Save two hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/page.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 06b04758f289..3882acde1b3e 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -73,7 +73,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode, */ void nilfs_forget_buffer(struct buffer_head *bh) { - struct page *page = bh->b_page; + struct folio *folio = bh->b_folio; const unsigned long clear_bits = (BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) | BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) | @@ -81,12 +81,12 @@ void nilfs_forget_buffer(struct buffer_head *bh) lock_buffer(bh); set_mask_bits(&bh->b_state, clear_bits, 0); - if (nilfs_page_buffers_clean(page)) - __nilfs_clear_page_dirty(page); + if (nilfs_page_buffers_clean(&folio->page)) + __nilfs_clear_page_dirty(&folio->page); bh->b_blocknr = -1; - ClearPageUptodate(page); - ClearPageMappedToDisk(page); + folio_clear_uptodate(folio); + folio_clear_mappedtodisk(folio); unlock_buffer(bh); brelse(bh); }