Commit 2758bb8a authored Mar 22, 2021 by Greg Kroah-Hartman

ANDROID: fix up ext4 build from 4.19.183



In commit b7ff91fd030d ("ext4: find old entry again if failed to rename
whiteout") a new call to ext4_find_entry() was made, but in commit
705a3e5b1852 ("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: 705a3e5b1852 ("ANDROID: ext4: Handle casefolding with encryption")
Fixes: b7ff91fd030d ("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&gt;BB>
Change-Id: I69b7f9c12d1f9016b8269e5bc7878469700b6477

parent 72af4b84

fs/ext4/namei.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3687,7 +3687,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)