Commit 2f18be36 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

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@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6e1cae88

mm/page-writeback.c

+1 −9
Original line number Diff line number Diff line
@@ -2508,20 +2508,12 @@ int __set_page_dirty_nobuffers(struct page *page) 
	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) {