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

Commit 63b99968 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: call ext4_es_lru_add() after handling cache miss 



If there are no items in the extent status tree, ext4_es_lru_add() is
a no-op.  So it is not sufficient to call ext4_es_lru_add() before we
try to lookup an entry in the extent status tree.  We also need to
call it at the end of ext4_ext_map_blocks(), after items have been
added to the extent status tree.

This could lead to inodes with that have extent status trees but which
are not in the LRU list, which means they won't get considered for
eviction by the es_shrinker.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: Zheng Liu <wenqing.lz@taobao.com>
Cc: stable@vger.kernel.org
parent 76828c88

fs/ext4/extents.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -4385,8 +4385,9 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 
	}

	}





out3:

out3:

	trace_ext4_ext_map_blocks_exit(inode, flags, map, err ? err : allocated);

	trace_ext4_ext_map_blocks_exit(inode, flags, map,



				       err ? err : allocated);

	ext4_es_lru_add(inode);

	return err ? err : allocated;

	return err ? err : allocated;

}

}

fs/ext4/inode.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -514,10 +514,9 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, 
		  "logical block %lu\n", inode->i_ino, flags, map->m_len,

		  "logical block %lu\n", inode->i_ino, flags, map->m_len,

		  (unsigned long) map->m_lblk);

		  (unsigned long) map->m_lblk);





	ext4_es_lru_add(inode);



	/* Lookup extent status tree firstly */

	/* Lookup extent status tree firstly */

	if (ext4_es_lookup_extent(inode, map->m_lblk, &es)) {

	if (ext4_es_lookup_extent(inode, map->m_lblk, &es)) {

		ext4_es_lru_add(inode);

		if (ext4_es_is_written(&es) || ext4_es_is_unwritten(&es)) {

		if (ext4_es_is_written(&es) || ext4_es_is_unwritten(&es)) {

			map->m_pblk = ext4_es_pblock(&es) +

			map->m_pblk = ext4_es_pblock(&es) +

					map->m_lblk - es.es_lblk;

					map->m_lblk - es.es_lblk;
@@ -1529,11 +1528,9 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, 
		  "logical block %lu\n", inode->i_ino, map->m_len,

		  "logical block %lu\n", inode->i_ino, map->m_len,

		  (unsigned long) map->m_lblk);

		  (unsigned long) map->m_lblk);





	ext4_es_lru_add(inode);



	/* Lookup extent status tree firstly */

	/* Lookup extent status tree firstly */

	if (ext4_es_lookup_extent(inode, iblock, &es)) {

	if (ext4_es_lookup_extent(inode, iblock, &es)) {



		ext4_es_lru_add(inode);

		if (ext4_es_is_hole(&es)) {

		if (ext4_es_is_hole(&es)) {

			retval = 0;

			retval = 0;

			down_read((&EXT4_I(inode)->i_data_sem));

			down_read((&EXT4_I(inode)->i_data_sem));