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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FF9CC7EE2C for ; Wed, 17 May 2023 03:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232167AbjEQDZI (ORCPT ); Tue, 16 May 2023 23:25:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232329AbjEQDZC (ORCPT ); Tue, 16 May 2023 23:25:02 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2090010E9 for ; Tue, 16 May 2023 20:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ZiXX6d+D9biDX+EYa0zHQ/9ZYfWb2pCGmEdAHT32kWA=; b=PlMaP/SYgBz75I2yrOn/mJyday IMHLSHKMkQ+dcVrUKhZ/biZg1IWYP9JPFqFSA/ODnzOeUK3lc4GdyAv0C8+JdHHwE/Hjjk0rctT7J 3i/QT8Wxtwqj0Ytr23wn2oiLO40qV+GWYgTfzThBxR8v6su7nsNTTaJgQeqSyl//Cdi2W7p5C3xB/ ZIzJJF9t2XTdk2UaE6mn2O3J1dLCuMjTZAh26CYCK5Z8abuD6gV0yk0ju/dmRMIhXI/DiieevD0MH RO7IymTleuf4pZPypUp3joBmmHHLombUVDWuC/lIhstkAQyu5j46Bn1odU4abe3g0NFmILHPNrXU0 +hffYG3A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pz7mN-004lN4-N2; Wed, 17 May 2023 03:24:43 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, Andrew Morton Cc: "Matthew Wilcox (Oracle)" , Bob Peterson , Andreas Gruenbacher , cluster-devel@redhat.com, Hannes Reinecke , Luis Chamberlain Subject: [PATCH 1/6] gfs2: Use a folio inside gfs2_jdata_writepage() Date: Wed, 17 May 2023 04:24:37 +0100 Message-Id: <20230517032442.1135379-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230517032442.1135379-1-willy@infradead.org> References: <20230517032442.1135379-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Replace a few implicit calls to compound_head() with one explicit one. Signed-off-by: Matthew Wilcox (Oracle) --- fs/gfs2/aops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index a5f4be6b9213..0518861df783 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -150,20 +150,21 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc) { + struct folio *folio = page_folio(page); struct inode *inode = page->mapping->host; struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_sbd *sdp = GFS2_SB(inode); if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl))) goto out; - if (PageChecked(page) || current->journal_info) + if (folio_test_checked(folio) || current->journal_info) goto out_ignore; - return __gfs2_jdata_writepage(page, wbc); + return __gfs2_jdata_writepage(&folio->page, wbc); out_ignore: - redirty_page_for_writepage(wbc, page); + folio_redirty_for_writepage(wbc, folio); out: - unlock_page(page); + folio_unlock(folio); return 0; } -- 2.39.2