From patchwork Mon May 2 05:56:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12833868 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 B5613C433EF for ; Mon, 2 May 2022 05:57:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383399AbiEBGAr (ORCPT ); Mon, 2 May 2022 02:00:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383410AbiEBGA2 (ORCPT ); Mon, 2 May 2022 02:00:28 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01BFC1FA72 for ; Sun, 1 May 2022 22:56:21 -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=eh6xgDdWf177qaxfMODvgKL5UEDIhv0WN38TTsndXvg=; b=wDVV9leXBK5EeE1rBYUu7HE7/D VPH7/OsgTPXGGBSEitrxBWP2hGY71uZQ/Rxn6T843meN+df7szhF/xTptIntNfGmf5gtrgHh4By/+ ukNCd/PpSPRIlDXRaNs5uxG0XjWMg+OsOpt/A+b9E2qmGqWvMcXTwUl5vsjUuk6x6Y/7/SkRJJARN wHx51u5obLv2wNcjiOMkvB4ThFQwnWKN+lqaYvIcmx6VRYZXmSj1VZ3AzGe7w00qjAmTbXmFHzlv1 M9XL29YmNbETjRVUUaAOyepZxMMhnTHp7ogd9LxRplNShHKR3NmmKlcFkMGCCAgEksfn0FfrTLP0r sw70TM9g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nlP2i-00EZXT-8u; Mon, 02 May 2022 05:56:20 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 26/26] fs: Convert drop_buffers() to use a folio Date: Mon, 2 May 2022 06:56:14 +0100 Message-Id: <20220502055614.3473032-27-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220502055614.3473032-1-willy@infradead.org> References: <20220502055614.3473032-1-willy@infradead.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org All callers now have a folio. Signed-off-by: Matthew Wilcox (Oracle) --- fs/buffer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 701af0035802..898c7f301b1b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -3180,10 +3180,10 @@ static inline int buffer_busy(struct buffer_head *bh) (bh->b_state & ((1 << BH_Dirty) | (1 << BH_Lock))); } -static int -drop_buffers(struct page *page, struct buffer_head **buffers_to_free) +static bool +drop_buffers(struct folio *folio, struct buffer_head **buffers_to_free) { - struct buffer_head *head = page_buffers(page); + struct buffer_head *head = folio_buffers(folio); struct buffer_head *bh; bh = head; @@ -3201,10 +3201,10 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free) bh = next; } while (bh != head); *buffers_to_free = head; - detach_page_private(page); - return 1; + folio_detach_private(folio); + return true; failed: - return 0; + return false; } bool try_to_free_buffers(struct folio *folio) @@ -3218,12 +3218,12 @@ bool try_to_free_buffers(struct folio *folio) return false; if (mapping == NULL) { /* can this still happen? */ - ret = drop_buffers(&folio->page, &buffers_to_free); + ret = drop_buffers(folio, &buffers_to_free); goto out; } spin_lock(&mapping->private_lock); - ret = drop_buffers(&folio->page, &buffers_to_free); + ret = drop_buffers(folio, &buffers_to_free); /* * If the filesystem writes its buffers by hand (eg ext3)