fs/ext4: updates from git.kernel.org/cgit/linux/kernel/git/tytso/ext4.git

from https://git.kernel.org/cgit/linux/kernel/git/tytso/ext4.git/commit/?h=for_linus_urgent&id=60ad4466821a96913a9b567115e194ed1087c2d7
(this commit can be found at this page https://git.kernel.org/cgit/linux/kernel/git/tytso/ext4.git/log/?h=for_linus_urgent&qt=grep&q=ext4&ofs=1050 )
Also fixed merge of function ext4_ind_direct_IO().