The patch titled Subject: mm/writeback: use __set_page_dirty in __set_page_dirty_nobuffers has been added to the -mm tree. Its filename is mm-writeback-use-__set_page_dirty-in-__set_page_dirty_nobuffers.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-writeback-use-__set_page_dirty-in-__set_page_dirty_nobuffers.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-writeback-use-__set_page_dirty-in-__set_page_dirty_nobuffers.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx> Subject: mm/writeback: use __set_page_dirty in __set_page_dirty_nobuffers This is fundamentally the same code, so just call it instead of duplicating it. Link: https://lkml.kernel.org/r/20210615162342.1669332-3-willy@xxxxxxxxxxxxx Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Reviewed-by: Christoph Hellwig <hch@xxxxxx> Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Jan Kara <jack@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page-writeback.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- a/mm/page-writeback.c~mm-writeback-use-__set_page_dirty-in-__set_page_dirty_nobuffers +++ a/mm/page-writeback.c @@ -2508,20 +2508,12 @@ int __set_page_dirty_nobuffers(struct pa lock_page_memcg(page); if (!TestSetPageDirty(page)) { struct address_space *mapping = page_mapping(page); - unsigned long flags; if (!mapping) { unlock_page_memcg(page); return 1; } - - xa_lock_irqsave(&mapping->i_pages, flags); - BUG_ON(page_mapping(page) != mapping); - WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page)); - account_page_dirtied(page, mapping); - __xa_set_mark(&mapping->i_pages, page_index(page), - PAGECACHE_TAG_DIRTY); - xa_unlock_irqrestore(&mapping->i_pages, flags); + __set_page_dirty(page, mapping, !PagePrivate(page)); unlock_page_memcg(page); if (mapping->host) { _ Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are mm-mark-idle-page-tracking-as-broken.patch writeback-cgroup-release-dying-cgwbs-by-switching-attached-inodes-fix-3.patch mm-writeback-move-__set_page_dirty-to-core-mm.patch mm-writeback-use-__set_page_dirty-in-__set_page_dirty_nobuffers.patch iomap-use-__set_page_dirty_nobuffers.patch fs-remove-anon_set_page_dirty.patch fs-remove-noop_set_page_dirty.patch mm-move-page-dirtying-prototypes-from-mmh.patch mm-make-__dump_page-static.patch mm-debug-factor-pagepoisoned-out-of-__dump_page.patch mm-page_owner-constify-dump_page_owner.patch mm-make-compound_head-const-preserving.patch mm-constify-get_pfnblock_flags_mask-and-get_pfnblock_migratetype.patch mm-constify-page_count-and-page_ref_count.patch mm-optimise-nth_page-for-contiguous-memmap.patch mm-hugetlb-free-the-vmemmap-pages-associated-with-each-hugetlb-page-fix.patch mm-hugetlb-alloc-the-vmemmap-pages-associated-with-each-hugetlb-page-fix-2.patch mm-thp-fix-strncpy-warning.patch