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 5C72EC07EBA for ; Tue, 14 Nov 2023 23:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234004AbjKNXXD (ORCPT ); Tue, 14 Nov 2023 18:23:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234126AbjKNXXB (ORCPT ); Tue, 14 Nov 2023 18:23:01 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8485D9 for ; Tue, 14 Nov 2023 15:22:57 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77688C43397; Tue, 14 Nov 2023 23:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1700004177; bh=4hWznDyyxSghEMHkOsao4S3tbC1IZFMW4yrqpZ/5csI=; h=Date:To:From:Subject:From; b=ftj46nFfHOerjhr/XHE+iv0MovRfab/VLRyFxIoGapYrMTjDoTB2flwkgRLbt9bPf u9ioNES8Ryp+Tp+bWxt+e0KY6LqZ/X8ibnnBXtHPEiRdZgDfvoMDtdq5Uqow3uFSX5 1hz3sgU/oUcStimQtKcDrKFX36ZsiThnI01g6A8Q= Date: Tue, 14 Nov 2023 15:22:56 -0800 To: mm-commits@vger.kernel.org, konishi.ryusuke@gmail.com, willy@infradead.org, akpm@linux-foundation.org From: Andrew Morton Subject: + nilfs2-convert-to-nilfs_folio_buffers_clean.patch added to mm-nonmm-unstable branch Message-Id: <20231114232257.77688C43397@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: nilfs2: convert to nilfs_folio_buffers_clean() has been added to the -mm mm-nonmm-unstable branch. Its filename is nilfs2-convert-to-nilfs_folio_buffers_clean.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/nilfs2-convert-to-nilfs_folio_buffers_clean.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: "Matthew Wilcox (Oracle)" Subject: nilfs2: convert to nilfs_folio_buffers_clean() Date: Tue, 14 Nov 2023 17:44:21 +0900 All callers of nilfs_page_buffers_clean() now have a folio, so convert it to take a folio. While I'm at it, make it return a bool. Link: https://lkml.kernel.org/r/20231114084436.2755-6-konishi.ryusuke@gmail.com Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton --- fs/nilfs2/page.c | 18 +++++++++--------- fs/nilfs2/page.h | 2 +- fs/nilfs2/segment.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) --- a/fs/nilfs2/page.c~nilfs2-convert-to-nilfs_folio_buffers_clean +++ a/fs/nilfs2/page.c @@ -81,7 +81,7 @@ void nilfs_forget_buffer(struct buffer_h lock_buffer(bh); set_mask_bits(&bh->b_state, clear_bits, 0); - if (nilfs_page_buffers_clean(&folio->page)) + if (nilfs_folio_buffers_clean(folio)) __nilfs_clear_page_dirty(&folio->page); bh->b_blocknr = -1; @@ -131,23 +131,23 @@ void nilfs_copy_buffer(struct buffer_hea } /** - * nilfs_page_buffers_clean - check if a page has dirty buffers or not. - * @page: page to be checked + * nilfs_folio_buffers_clean - Check if a folio has dirty buffers or not. + * @folio: Folio to be checked. * - * nilfs_page_buffers_clean() returns zero if the page has dirty buffers. - * Otherwise, it returns non-zero value. + * nilfs_folio_buffers_clean() returns false if the folio has dirty buffers. + * Otherwise, it returns true. */ -int nilfs_page_buffers_clean(struct page *page) +bool nilfs_folio_buffers_clean(struct folio *folio) { struct buffer_head *bh, *head; - bh = head = page_buffers(page); + bh = head = folio_buffers(folio); do { if (buffer_dirty(bh)) - return 0; + return false; bh = bh->b_this_page; } while (bh != head); - return 1; + return true; } void nilfs_page_bug(struct page *page) --- a/fs/nilfs2/page.h~nilfs2-convert-to-nilfs_folio_buffers_clean +++ a/fs/nilfs2/page.h @@ -36,7 +36,7 @@ struct buffer_head *nilfs_grab_buffer(st unsigned long, unsigned long); void nilfs_forget_buffer(struct buffer_head *); void nilfs_copy_buffer(struct buffer_head *, struct buffer_head *); -int nilfs_page_buffers_clean(struct page *); +bool nilfs_folio_buffers_clean(struct folio *); void nilfs_page_bug(struct page *); int nilfs_copy_dirty_pages(struct address_space *, struct address_space *); --- a/fs/nilfs2/segment.c~nilfs2-convert-to-nilfs_folio_buffers_clean +++ a/fs/nilfs2/segment.c @@ -1759,7 +1759,7 @@ static void nilfs_end_folio_io(struct fo * all the buffers get cleaned later. */ folio_lock(folio); - if (nilfs_page_buffers_clean(&folio->page)) + if (nilfs_folio_buffers_clean(folio)) __nilfs_clear_page_dirty(&folio->page); folio_unlock(folio); } @@ -1767,7 +1767,7 @@ static void nilfs_end_folio_io(struct fo } if (!err) { - if (!nilfs_page_buffers_clean(&folio->page)) + if (!nilfs_folio_buffers_clean(folio)) filemap_dirty_folio(folio->mapping, folio); folio_clear_error(folio); } else { _ Patches currently in -mm which might be from willy@infradead.org are mm-add-folio_zero_tail-and-use-it-in-ext4.patch mm-add-folio_fill_tail-and-use-it-in-iomap.patch gfs2-convert-stuffed_readpage-to-stuffed_read_folio.patch mm-remove-test_set_page_writeback.patch afs-do-not-test-the-return-value-of-folio_start_writeback.patch smb-do-not-test-the-return-value-of-folio_start_writeback.patch mm-return-void-from-folio_start_writeback-and-related-functions.patch mm-make-mapping_evict_folio-the-preferred-way-to-evict-clean-folios.patch mm-convert-__do_fault-to-use-a-folio.patch mm-use-mapping_evict_folio-in-truncate_error_page.patch mm-convert-soft_offline_in_use_page-to-use-a-folio.patch mm-convert-isolate_page-to-mf_isolate_folio.patch mm-remove-invalidate_inode_page.patch buffer-return-bool-from-grow_dev_folio.patch buffer-calculate-block-number-inside-folio_init_buffers.patch buffer-fix-grow_buffers-for-block-size-page_size.patch buffer-cast-block-to-loff_t-before-shifting-it.patch buffer-fix-various-functions-for-block-size-page_size.patch buffer-handle-large-folios-in-__block_write_begin_int.patch buffer-fix-more-functions-for-block-size-page_size.patch gfp-include-__gfp_nowarn-in-gfp_nowait.patch nilfs2-add-nilfs_end_folio_io.patch nilfs2-convert-nilfs_abort_logs-to-use-folios.patch nilfs2-convert-nilfs_segctor_complete_write-to-use-folios.patch nilfs2-convert-nilfs_forget_buffer-to-use-a-folio.patch nilfs2-convert-to-nilfs_folio_buffers_clean.patch nilfs2-convert-nilfs_writepage-to-use-a-folio.patch nilfs2-convert-nilfs_mdt_write_page-to-use-a-folio.patch nilfs2-convert-to-nilfs_clear_folio_dirty.patch nilfs2-convert-to-__nilfs_clear_folio_dirty.patch nilfs2-convert-nilfs_segctor_prepare_write-to-use-folios.patch nilfs2-convert-nilfs_page_mkwrite-to-use-a-folio.patch nilfs2-convert-nilfs_mdt_create_block-to-use-a-folio.patch nilfs2-convert-nilfs_mdt_submit_block-to-use-a-folio.patch nilfs2-convert-nilfs_gccache_submit_read_data-to-use-a-folio.patch nilfs2-convert-nilfs_btnode_create_block-to-use-a-folio.patch nilfs2-convert-nilfs_btnode_submit_block-to-use-a-folio.patch nilfs2-convert-nilfs_btnode_delete-to-use-a-folio.patch nilfs2-convert-nilfs_btnode_prepare_change_key-to-use-a-folio.patch nilfs2-convert-nilfs_btnode_commit_change_key-to-use-a-folio.patch nilfs2-convert-nilfs_btnode_abort_change_key-to-use-a-folio.patch