Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
fs/ext4/ext4.h
between commit:
109811c20fb8 ("ext4: simplify io_end handling for AIO DIO")
from the ext4 tree and commit:
74c66bcb7eda ("ext4: Fix data exposure after failed AIO DIO")
from the xfs tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc fs/ext4/ext4.h
index 70b8e0409566,56c12df107ab..000000000000
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@@ -1499,15 -1504,16 +1499,6 @@@ static inline int ext4_valid_inum(struc
ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count));
}
- static inline void ext4_set_io_unwritten_flag(struct inode *inode,
- struct ext4_io_end *io_end)
-static inline ext4_io_end_t *ext4_inode_aio(struct inode *inode)
--{
- if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
- io_end->flag |= EXT4_IO_END_UNWRITTEN;
- atomic_inc(&EXT4_I(inode)->i_unwritten);
- }
- return inode->i_private;
-}
-
-static inline void ext4_inode_aio_set(struct inode *inode, ext4_io_end_t *io)
-{
- inode->i_private = io;
--}
--
/*
* Inode dynamic state flags
*/
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
