Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aec2f729 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: clean up with clear_radix_tree_dirty_tag 



Introduce clear_radix_tree_dirty_tag to include common codes for cleanup.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 64c74a7a

fs/f2fs/data.c

+11 −0
Original line number Diff line number Diff line
@@ -2594,6 +2594,17 @@ const struct address_space_operations f2fs_dblock_aops = { 
#endif

};



void clear_radix_tree_dirty_tag(struct page *page)

{

	struct address_space *mapping = page_mapping(page);

	unsigned long flags;



	xa_lock_irqsave(&mapping->i_pages, flags);

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

						PAGECACHE_TAG_DIRTY);

	xa_unlock_irqrestore(&mapping->i_pages, flags);

}



int __init f2fs_init_post_read_processing(void)

{

	bio_post_read_ctx_cache = KMEM_CACHE(bio_post_read_ctx, 0);

fs/f2fs/dir.c

+1 −7
Original line number Diff line number Diff line
@@ -698,8 +698,6 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 
	struct	f2fs_dentry_block *dentry_blk;

	unsigned int bit_pos;

	int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));

	struct address_space *mapping = page_mapping(page);

	unsigned long flags;

	int i;



	f2fs_update_time(F2FS_I_SB(dir), REQ_TIME);
@@ -732,11 +730,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 


	if (bit_pos == NR_DENTRY_IN_BLOCK &&

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

		xa_lock_irqsave(&mapping->i_pages, flags);

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

				     PAGECACHE_TAG_DIRTY);

		xa_unlock_irqrestore(&mapping->i_pages, flags);



		clear_radix_tree_dirty_tag(page);

		clear_page_dirty_for_io(page);

		ClearPagePrivate(page);

		ClearPageUptodate(page);

fs/f2fs/f2fs.h

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

#endif

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

void clear_radix_tree_dirty_tag(struct page *page);



/*

 * gc.c

fs/f2fs/inline.c

+1 −6
Original line number Diff line number Diff line
@@ -204,8 +204,6 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) 
{

	void *src_addr, *dst_addr;

	struct dnode_of_data dn;

	struct address_space *mapping = page_mapping(page);

	unsigned long flags;

	int err;



	set_new_dnode(&dn, inode, NULL, NULL, 0);
@@ -227,10 +225,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) 
	kunmap_atomic(src_addr);

	set_page_dirty(dn.inode_page);



	xa_lock_irqsave(&mapping->i_pages, flags);

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

			     PAGECACHE_TAG_DIRTY);

	xa_unlock_irqrestore(&mapping->i_pages, flags);

	clear_radix_tree_dirty_tag(page);



	set_inode_flag(inode, FI_APPEND_WRITE);

	set_inode_flag(inode, FI_DATA_EXIST);

fs/f2fs/node.c

+2 −10
Original line number Diff line number Diff line
@@ -102,18 +102,10 @@ bool available_free_memory(struct f2fs_sb_info *sbi, int type) 


static void clear_node_page_dirty(struct page *page)

{

	struct address_space *mapping = page->mapping;

	unsigned int long flags;



	if (PageDirty(page)) {

		xa_lock_irqsave(&mapping->i_pages, flags);

		radix_tree_tag_clear(&mapping->i_pages,

				page_index(page),

				PAGECACHE_TAG_DIRTY);

		xa_unlock_irqrestore(&mapping->i_pages, flags);



		clear_radix_tree_dirty_tag(page);

		clear_page_dirty_for_io(page);

		dec_page_count(F2FS_M_SB(mapping), F2FS_DIRTY_NODES);

		dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);

	}

	ClearPageUptodate(page);

}