shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: fix up ext4 build from 5.10.26

Browse Source 
In commit b7ff91fd03 ("ext4: find old entry again if failed to rename
whiteout") a new call to ext4_find_entry() was made, but in commit
705a3e5b18 ("ANDROID: ext4: Handle casefolding with encryption")
only in the ANDROID tree, a new parameter is added to that function.

Add NULL there to keep the build working, hopefully one-day the
out-of-tree patch will get merged upstream...

Fixes: 705a3e5b18 ("ANDROID: ext4: Handle casefolding with encryption")
Fixes: b7ff91fd03 ("ext4: find old entry again if failed to rename whiteout")
Cc: Daniel Rosenberg <drosen@google.com>
Cc: Paul Lawrence <paullawrence@google.com>
Bug: 138322712
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>BB
Change-Id: I69b7f9c12d1f9016b8269e5bc7878469700b6477
This commit is contained in:
Greg Kroah-Hartman
2021-03-22 09:25:40 +01:00
parent 57b60a3a15
commit d5992d56cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ext4/namei.c
View File

@@ -3726,7 +3726,8 @@ static void ext4_resetent(handle_t *handle, struct ext4_renament *ent,
* so the old->de may no longer valid and need to find it again
* before reset old inode info.
*/
old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL);
old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL,
NULL);
if (IS_ERR(old.bh))
retval = PTR_ERR(old.bh);
if (!old.bh)