commit 2ba48ce513c4e545318d22b138861d5876edf906
author Al Viro <viro@zeniv.linux.org.uk> Thu Apr 09 13:52:01 2015 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sat Apr 11 22:30:22 2015 -0400
tree 0e2a5130ead5c71f0b079b1acd620fba98f99256
parent 3309dd04cbcd2cdad168485af5cf3576b5051e49

mirror O_APPEND and O_DIRECT into iocb->ki_flags

... avoiding write_iter/fcntl races.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/ext4/file.c

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index c10785f..53bbc0b 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -95,7 +95,7 @@
 	struct inode *inode = file_inode(iocb->ki_filp);
 	struct mutex *aio_mutex = NULL;
 	struct blk_plug plug;
-	int o_direct = io_is_direct(file);
+	int o_direct = iocb->ki_flags & IOCB_DIRECT;
 	int overwrite = 0;
 	ssize_t ret;
 
@@ -106,7 +106,7 @@
 	if (o_direct &&
 	    ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &&
 	    !is_sync_kiocb(iocb) &&
-	    (file->f_flags & O_APPEND ||
+	    (iocb->ki_flags & IOCB_APPEND ||
 	     ext4_unaligned_aio(inode, from, iocb->ki_pos))) {
 		aio_mutex = ext4_aio_mutex(inode);
 		mutex_lock(aio_mutex);