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

Commit 33654719 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Jaegeuk Kim
Browse files

f2fs: specify extent cache for read explicitly 



Let's descrbie it's read extent cache.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 330e9aff

fs/f2fs/extent_cache.c

+2 −2
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static void __f2fs_init_extent_tree(struct inode *inode, struct page *ipage) 
	if (!i_ext || !i_ext->len)

		return;



	get_extent_info(&ei, i_ext);

	get_read_extent_info(&ei, i_ext);



	write_lock(&et->lock);

	if (atomic_read(&et->node_cnt))
@@ -710,7 +710,7 @@ unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) 
	unsigned int node_cnt = 0, tree_cnt = 0;

	int remained;



	if (!test_opt(sbi, EXTENT_CACHE))

	if (!test_opt(sbi, READ_EXTENT_CACHE))

		return 0;



	if (!atomic_read(&sbi->total_zombie_tree))

fs/f2fs/f2fs.h

+5 −5
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ extern const char *f2fs_fault_name[FAULT_MAX]; 
#define F2FS_MOUNT_FLUSH_MERGE		0x00000400

#define F2FS_MOUNT_NOBARRIER		0x00000800

#define F2FS_MOUNT_FASTBOOT		0x00001000

#define F2FS_MOUNT_EXTENT_CACHE		0x00002000

#define F2FS_MOUNT_READ_EXTENT_CACHE	0x00002000

#define F2FS_MOUNT_DATA_FLUSH		0x00008000

#define F2FS_MOUNT_FAULT_INJECTION	0x00010000

#define F2FS_MOUNT_USRQUOTA		0x00080000
@@ -596,7 +596,7 @@ enum { 
#define F2FS_MIN_EXTENT_LEN	64	/* minimum extent length */



/* number of extent info in extent cache we try to shrink */

#define EXTENT_CACHE_SHRINK_NUMBER	128

#define READ_EXTENT_CACHE_SHRINK_NUMBER	128



#define RECOVERY_MAX_RA_BLOCKS		BIO_MAX_PAGES

#define RECOVERY_MIN_RA_BLOCKS		1
@@ -828,7 +828,7 @@ struct f2fs_inode_info { 
	loff_t original_i_size;		/* original i_size before atomic write */

};



static inline void get_extent_info(struct extent_info *ext,

static inline void get_read_extent_info(struct extent_info *ext,

					struct f2fs_extent *i_ext)

{

	ext->fofs = le32_to_cpu(i_ext->fofs);
@@ -836,7 +836,7 @@ static inline void get_extent_info(struct extent_info *ext, 
	ext->len = le32_to_cpu(i_ext->len);

}



static inline void set_raw_extent(struct extent_info *ext,

static inline void set_raw_read_extent(struct extent_info *ext,

					struct f2fs_extent *i_ext)

{

	i_ext->fofs = cpu_to_le32(ext->fofs);
@@ -4448,7 +4448,7 @@ static inline bool f2fs_may_extent_tree(struct inode *inode) 
{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);



	if (!test_opt(sbi, EXTENT_CACHE) ||

	if (!test_opt(sbi, READ_EXTENT_CACHE) ||

			is_inode_flag_set(inode, FI_NO_EXTENT) ||

			(is_inode_flag_set(inode, FI_COMPRESSED_FILE) &&

			 !f2fs_sb_has_readonly(sbi)))

fs/f2fs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ void f2fs_update_inode(struct inode *inode, struct page *node_page) 


	if (et) {

		read_lock(&et->lock);

		set_raw_extent(&et->largest, &ri->i_ext);

		set_raw_read_extent(&et->largest, &ri->i_ext);

		read_unlock(&et->lock);

	} else {

		memset(&ri->i_ext, 0, sizeof(ri->i_ext));

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type) 
						sizeof(struct ino_entry);

		mem_size >>= PAGE_SHIFT;

		res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 1);

	} else if (type == EXTENT_CACHE) {

	} else if (type == READ_EXTENT_CACHE) {

		mem_size = (atomic_read(&sbi->total_ext_tree) *

				sizeof(struct extent_tree) +

				atomic_read(&sbi->total_ext_node) *

fs/f2fs/node.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ enum mem_type { 
	NAT_ENTRIES,	/* indicates the cached nat entry */

	DIRTY_DENTS,	/* indicates dirty dentry pages */

	INO_ENTRIES,	/* indicates inode entries */

	EXTENT_CACHE,	/* indicates extent cache */

	READ_EXTENT_CACHE,	/* indicates read extent cache */

	DISCARD_CACHE,	/* indicates memory of cached discard cmds */

	COMPRESS_PAGE,	/* indicates memory of cached compressed pages */

	BASE_CHECK,	/* check kernel status */