Commit 6974b21f authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Jaegeuk Kim
Browse files

f2fs: Remove clear_page_private_all() 



All callers can simply call folio_detach_private().  This was the
only way that clear_page_private_data() could be called, so remove
that too.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0f54eec0

fs/f2fs/data.c

+2 −2
Original line number Diff line number Diff line
@@ -3736,7 +3736,7 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length) 
			f2fs_remove_dirty_inode(inode);

		}

	}

	clear_page_private_all(&folio->page);

	folio_detach_private(folio);

}



bool f2fs_release_folio(struct folio *folio, gfp_t wait)
@@ -3745,7 +3745,7 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait) 
	if (folio_test_dirty(folio))

		return false;



	clear_page_private_all(&folio->page);

	folio_detach_private(folio);

	return true;

}

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct folio *folio, 
		f2fs_clear_page_cache_dirty_tag(folio);

		folio_clear_dirty_for_io(folio);

		folio_clear_uptodate(folio);

		clear_page_private_all(&folio->page);

		folio_detach_private(folio);



		inode_dec_dirty_pages(dir);

		f2fs_remove_dirty_inode(dir);

fs/f2fs/f2fs.h

+0 −18
Original line number Diff line number Diff line
@@ -2547,24 +2547,6 @@ static inline void folio_set_f2fs_data(struct folio *folio, unsigned long data) 
		folio->private = (void *)((unsigned long)folio->private | data);

}



static inline void clear_page_private_data(struct page *page)

{

	page_private(page) &= GENMASK(PAGE_PRIVATE_MAX - 1, 0);

	if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER))

		detach_page_private(page);

}



static inline void clear_page_private_all(struct page *page)

{

	clear_page_private_data(page);

	clear_page_private_reference(page);

	clear_page_private_gcing(page);

	clear_page_private_inline(page);

	clear_page_private_atomic(page);



	f2fs_bug_on(F2FS_P_SB(page), page_private(page));

}



static inline void dec_valid_block_count(struct f2fs_sb_info *sbi,

						struct inode *inode,

						block_t count)