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

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

f2fs: merge {invalidate,release}page for meta/node/data pages 



This patch merges ->{invalidate,release}page function for meta/node/data pages.

After this, duplication of codes could be removed.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent d24bdcbf

fs/f2fs/checkpoint.c

+2 −22
Original line number Diff line number Diff line
@@ -309,32 +309,12 @@ static int f2fs_set_meta_page_dirty(struct page *page) 
	return 0;

}



static void f2fs_invalidate_meta_page(struct page *page, unsigned int offset,

				      unsigned int length)

{

	struct inode *inode = page->mapping->host;



	if (PageDirty(page))

		dec_page_count(F2FS_I_SB(inode), F2FS_DIRTY_META);

	ClearPagePrivate(page);

}



static int f2fs_release_meta_page(struct page *page, gfp_t wait)

{

	/* If this is dirty page, keep PagePrivate */

	if (PageDirty(page))

		return 0;



	ClearPagePrivate(page);

	return 1;

}



const struct address_space_operations f2fs_meta_aops = {

	.writepage	= f2fs_write_meta_page,

	.writepages	= f2fs_write_meta_pages,

	.set_page_dirty	= f2fs_set_meta_page_dirty,

	.invalidatepage = f2fs_invalidate_meta_page,

	.releasepage	= f2fs_release_meta_page,

	.invalidatepage = f2fs_invalidate_page,

	.releasepage	= f2fs_release_page,

};



static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type)

fs/f2fs/data.c

+16 −8
Original line number Diff line number Diff line
@@ -1115,20 +1115,28 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb, 
	return err;

}



static void f2fs_invalidate_data_page(struct page *page, unsigned int offset,

void f2fs_invalidate_page(struct page *page, unsigned int offset,

							unsigned int length)

{

	struct inode *inode = page->mapping->host;

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);



	if (offset % PAGE_CACHE_SIZE || length != PAGE_CACHE_SIZE)

	if (inode->i_ino >= F2FS_ROOT_INO(sbi) &&

		(offset % PAGE_CACHE_SIZE || length != PAGE_CACHE_SIZE))

		return;



	if (PageDirty(page))

	if (PageDirty(page)) {

		if (inode->i_ino == F2FS_META_INO(sbi))

			dec_page_count(sbi, F2FS_DIRTY_META);

		else if (inode->i_ino == F2FS_NODE_INO(sbi))

			dec_page_count(sbi, F2FS_DIRTY_NODES);

		else

			inode_dec_dirty_pages(inode);

	}

	ClearPagePrivate(page);

}



static int f2fs_release_data_page(struct page *page, gfp_t wait)

int f2fs_release_page(struct page *page, gfp_t wait)

{

	/* If this is dirty page, keep PagePrivate */

	if (PageDirty(page))
@@ -1183,8 +1191,8 @@ const struct address_space_operations f2fs_dblock_aops = { 
	.write_begin	= f2fs_write_begin,

	.write_end	= f2fs_write_end,

	.set_page_dirty	= f2fs_set_data_page_dirty,

	.invalidatepage	= f2fs_invalidate_data_page,

	.releasepage	= f2fs_release_data_page,

	.invalidatepage	= f2fs_invalidate_page,

	.releasepage	= f2fs_release_page,

	.direct_IO	= f2fs_direct_IO,

	.bmap		= f2fs_bmap,

};

fs/f2fs/f2fs.h

+2 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,8 @@ struct page *get_lock_data_page(struct inode *, pgoff_t); 
struct page *get_new_data_page(struct inode *, struct page *, pgoff_t, bool);

int do_write_data_page(struct page *, struct f2fs_io_info *);

int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *, u64, u64);

void f2fs_invalidate_page(struct page *, unsigned int, unsigned int);

int f2fs_release_page(struct page *, gfp_t);



/*

 * gc.c

fs/f2fs/node.c

+2 −21
Original line number Diff line number Diff line
@@ -1370,25 +1370,6 @@ static int f2fs_set_node_page_dirty(struct page *page) 
	return 0;

}



static void f2fs_invalidate_node_page(struct page *page, unsigned int offset,

				      unsigned int length)

{

	struct inode *inode = page->mapping->host;

	if (PageDirty(page))

		dec_page_count(F2FS_I_SB(inode), F2FS_DIRTY_NODES);

	ClearPagePrivate(page);

}



static int f2fs_release_node_page(struct page *page, gfp_t wait)

{

	/* If this is dirty page, keep PagePrivate */

	if (PageDirty(page))

		return 0;



	ClearPagePrivate(page);

	return 1;

}



/*

 * Structure of the f2fs node operations

 */
@@ -1396,8 +1377,8 @@ const struct address_space_operations f2fs_node_aops = { 
	.writepage	= f2fs_write_node_page,

	.writepages	= f2fs_write_node_pages,

	.set_page_dirty	= f2fs_set_node_page_dirty,

	.invalidatepage	= f2fs_invalidate_node_page,

	.releasepage	= f2fs_release_node_page,

	.invalidatepage	= f2fs_invalidate_page,

	.releasepage	= f2fs_release_page,

};



static struct free_nid *__lookup_free_nid_list(struct f2fs_nm_info *nm_i,