Merge 4911610c ("ext4: fix warning in ext4_dio_write_end_io()") into android12-5.10-lts

Steps on the way to 5.10.227

Resolves merge conflicts in:
	fs/ext4/file.c

We merge around this change as it is fixing up something that we have
already reverted in this branch.

Change-Id: I2ba36e89e69fb04fc0368b458b106e6498db53f4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>