ext4: remove warning
Fix Linux update merge errors