[PATCH 5.10.y 0/2] Backport 2 commits to fix a KASAN ext4 splat