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

Commit ed3d1256 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: load largest extent all the time 



Otherwise, we can get mismatched largest extent information.

One example is:
1. mount f2fs w/ extent_cache
2. make a small extent
3. umount
4. mount f2fs w/o extent_cache
5. update the largest extent
6. umount
7. mount f2fs w/ extent_cache
8. get the old extent made by #2

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

fs/f2fs/extent_cache.c

+13 −5
Original line number Diff line number Diff line
@@ -166,20 +166,27 @@ static void __drop_largest_extent(struct inode *inode, 
		largest->len = 0;

}



void f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)

/* return true, if inode page is changed */

bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct extent_tree *et;

	struct extent_node *en;

	struct extent_info ei;



	if (!f2fs_may_extent_tree(inode))

		return;

	if (!f2fs_may_extent_tree(inode)) {

		/* drop largest extent */

		if (i_ext && i_ext->len) {

			i_ext->len = 0;

			return true;

		}

		return false;

	}



	et = __grab_extent_tree(inode);



	if (!i_ext || le32_to_cpu(i_ext->len) < F2FS_MIN_EXTENT_LEN)

		return;

	if (!i_ext || !i_ext->len)

		return false;



	set_extent_info(&ei, le32_to_cpu(i_ext->fofs),

		le32_to_cpu(i_ext->blk), le32_to_cpu(i_ext->len));
@@ -196,6 +203,7 @@ void f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) 
	}

out:

	write_unlock(&et->lock);

	return false;

}



static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs,

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2083,7 +2083,7 @@ void f2fs_leave_shrinker(struct f2fs_sb_info *); 
 * extent_cache.c

 */

unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *, int);

void f2fs_init_extent_tree(struct inode *, struct f2fs_extent *);

bool f2fs_init_extent_tree(struct inode *, struct f2fs_extent *);

unsigned int f2fs_destroy_extent_node(struct inode *);

void f2fs_destroy_extent_tree(struct inode *);

bool f2fs_lookup_extent_cache(struct inode *, pgoff_t, struct extent_info *);

fs/f2fs/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ static int do_read_inode(struct inode *inode) 
	fi->i_pino = le32_to_cpu(ri->i_pino);

	fi->i_dir_level = ri->i_dir_level;



	f2fs_init_extent_tree(inode, &ri->i_ext);

	if (f2fs_init_extent_tree(inode, &ri->i_ext))

		set_page_dirty(node_page);



	get_inline_info(fi, ri);