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

Commit 0e1147b0 authored by Robin Dong's avatar Robin Dong Committed by Theodore Ts'o
Browse files

ext4: add action of moving index in ext4_ext_rm_idx for Punch Hole 



The old function ext4_ext_rm_idx is used only for truncate case
because it just remove last index in extent-index-block. When punching
hole, it usually needed to remove "middle" index, therefore we must
move indexes which after it forward.

(I create a file with 1 depth extent tree and punch hole in the middle
of it, the last index in index-block strangly gone, so I find out this
bug)

Signed-off-by: default avatarRobin Dong <sanbai@taobao.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 668f4dc5

fs/ext4/extents.c

+7 −2
Original line number Diff line number Diff line
@@ -2101,8 +2101,6 @@ ext4_ext_in_cache(struct inode *inode, ext4_lblk_t block, 
/*

 * ext4_ext_rm_idx:

 * removes index from the index block.

 * It's used in truncate case only, thus all requests are for

 * last index in the block only.

 */

static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,

			struct ext4_ext_path *path)
@@ -2120,6 +2118,13 @@ static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode, 
	err = ext4_ext_get_access(handle, inode, path);

	if (err)

		return err;



	if (path->p_idx != EXT_LAST_INDEX(path->p_hdr)) {

		int len = EXT_LAST_INDEX(path->p_hdr) - path->p_idx;

		len *= sizeof(struct ext4_extent_idx);

		memmove(path->p_idx, path->p_idx + 1, len);

	}



	le16_add_cpu(&path->p_hdr->eh_entries, -1);

	err = ext4_ext_dirty(handle, inode, path);

	if (err)