From d5992d56cc6947885234bdd170ccfbfe2c5de9df Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Mar 2021 09:25:40 +0100 Subject: [PATCH] ANDROID: fix up ext4 build from 5.10.26 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 Cc: Paul Lawrence Bug: 138322712 Signed-off-by: Greg Kroah-Hartman BB Change-Id: I69b7f9c12d1f9016b8269e5bc7878469700b6477 --- fs/ext4/namei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index a35ffb8af290..9128e165a673 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -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)