two ext4 fixes from 3.16-stable