Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/ext4/inode.c
between commit 72b8e0f9fa8a ("ext4: remove unused header files") from the ext4
tree and commit e2e40f2c1ed4 ("fs: move struct kiocb to fs.h") from the vfs
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc fs/ext4/inode.c
index 7eb70b7a5c19,42c942a950e1..000000000000
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@@ -35,12 -36,10 +35,11 @@@
#include <linux/kernel.h>
#include <linux/printk.h>
#include <linux/slab.h>
- #include <linux/aio.h>
-#include <linux/ratelimit.h>
#include <linux/bitops.h>
+#include <linux/prefetch.h>
#include "ext4_jbd2.h"
+#include "ext4_crypto.h"
#include "xattr.h"
#include "acl.h"
#include "truncate.h"
@@@ -3136,14 -3033,11 +3135,14 @@@ static ssize_t ext4_ext_direct_IO(struc
get_block_func = ext4_get_block_write;
dio_flags = DIO_LOCKING;
}
+#ifdef CONFIG_EXT4_FS_ENCRYPTION
+ BUG_ON(ext4_encrypted_inode(inode) && S_ISREG(inode->i_mode));
+#endif
if (IS_DAX(inode))
- ret = dax_do_io(rw, iocb, inode, iter, offset, get_block_func,
+ ret = dax_do_io(iocb, inode, iter, offset, get_block_func,
ext4_end_io_dio, dio_flags);
else
- ret = __blockdev_direct_IO(rw, iocb, inode,
+ ret = __blockdev_direct_IO(iocb, inode,
inode->i_sb->s_bdev, iter, offset,
get_block_func,
ext4_end_io_dio, NULL, dio_flags);
pgpc6rWu57mIk.pgp
Description: OpenPGP digital signature
