Unverified Commit 74893ed5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13045 [sync] PR-12958: ext4: update orig_path in ext4_find_extent() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/12958 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RBGHVKS2HEX7SGVP3I4LUZHKLLITE25B/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAZ5OQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/13045

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 893457e6 497510b7

fs/ext4/extents.c

+2 −1
Original line number Diff line number Diff line
@@ -960,6 +960,8 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block, 


	ext4_ext_show_path(inode, path);



	if (orig_path)

		*orig_path = path;

	return path;



err:
@@ -3284,7 +3286,6 @@ static int ext4_split_extent_at(handle_t *handle, 
	}

	depth = ext_depth(inode);

	ex = path[depth].p_ext;

	*ppath = path;



	if (EXT4_EXT_MAY_ZEROOUT & split_flag) {

		if (split_flag & (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {

fs/ext4/move_extent.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock, 
		*ppath = NULL;

		return -ENODATA;

	}

	*ppath = path;

	return 0;

}