Commit 5ec2d99d authored by Matthew Wilcox's avatar Matthew Wilcox
Browse files

f2fs: Convert to XArray 



This is a straightforward conversion.

Signed-off-by: default avatarMatthew Wilcox <willy@infradead.org>
parent f611ff63

fs/f2fs/data.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2697,13 +2697,13 @@ const struct address_space_operations f2fs_dblock_aops = { 
#endif

#endif

};

};





void f2fs_clear_radix_tree_dirty_tag(struct page *page)

void f2fs_clear_page_cache_dirty_tag(struct page *page)

{

{

	struct address_space *mapping = page_mapping(page);

	struct address_space *mapping = page_mapping(page);

	unsigned long flags;

	unsigned long flags;





	xa_lock_irqsave(&mapping->i_pages, flags);

	xa_lock_irqsave(&mapping->i_pages, flags);

	radix_tree_tag_clear(&mapping->i_pages, page_index(page),

	__xa_clear_mark(&mapping->i_pages, page_index(page),

						PAGECACHE_TAG_DIRTY);

						PAGECACHE_TAG_DIRTY);

	xa_unlock_irqrestore(&mapping->i_pages, flags);

	xa_unlock_irqrestore(&mapping->i_pages, flags);

}

}

fs/f2fs/dir.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -729,7 +729,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 




	if (bit_pos == NR_DENTRY_IN_BLOCK &&

	if (bit_pos == NR_DENTRY_IN_BLOCK &&

		!f2fs_truncate_hole(dir, page->index, page->index + 1)) {

		!f2fs_truncate_hole(dir, page->index, page->index + 1)) {

		f2fs_clear_radix_tree_dirty_tag(page);

		f2fs_clear_page_cache_dirty_tag(page);

		clear_page_dirty_for_io(page);

		clear_page_dirty_for_io(page);

		ClearPagePrivate(page);

		ClearPagePrivate(page);

		ClearPageUptodate(page);

		ClearPageUptodate(page);

fs/f2fs/f2fs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -3039,7 +3039,7 @@ int f2fs_migrate_page(struct address_space *mapping, struct page *newpage, 
			struct page *page, enum migrate_mode mode);

			struct page *page, enum migrate_mode mode);

#endif

#endif

bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len);

bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len);

void f2fs_clear_radix_tree_dirty_tag(struct page *page);

void f2fs_clear_page_cache_dirty_tag(struct page *page);





/*

/*

 * gc.c

 * gc.c

fs/f2fs/inline.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -245,7 +245,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) 
	kunmap_atomic(src_addr);

	kunmap_atomic(src_addr);

	set_page_dirty(dn.inode_page);

	set_page_dirty(dn.inode_page);





	f2fs_clear_radix_tree_dirty_tag(page);

	f2fs_clear_page_cache_dirty_tag(page);





	set_inode_flag(inode, FI_APPEND_WRITE);

	set_inode_flag(inode, FI_APPEND_WRITE);

	set_inode_flag(inode, FI_DATA_EXIST);

	set_inode_flag(inode, FI_DATA_EXIST);

fs/f2fs/node.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type) 
static void clear_node_page_dirty(struct page *page)

static void clear_node_page_dirty(struct page *page)

{

{

	if (PageDirty(page)) {

	if (PageDirty(page)) {

		f2fs_clear_radix_tree_dirty_tag(page);

		f2fs_clear_page_cache_dirty_tag(page);

		clear_page_dirty_for_io(page);

		clear_page_dirty_for_io(page);

		dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);

		dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);

	}

	}
@@ -1307,9 +1307,7 @@ void f2fs_ra_node_page(struct f2fs_sb_info *sbi, nid_t nid) 
	if (f2fs_check_nid_range(sbi, nid))

	if (f2fs_check_nid_range(sbi, nid))

		return;

		return;





	rcu_read_lock();

	apage = xa_load(&NODE_MAPPING(sbi)->i_pages, nid);

	apage = radix_tree_lookup(&NODE_MAPPING(sbi)->i_pages, nid);

	rcu_read_unlock();

	if (apage)

	if (apage)

		return;

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE