Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1354668 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-03-10 00:50 +0100 |
| Last post | 2016-03-10 10:20 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the xfs tree with the ext4 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-10 00:50 +0100
Re: linux-next: manual merge of the xfs tree with the ext4 tree Jan Kara <jack@suse.cz> - 2016-03-10 10:20 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-03-10 00:50 +0100 |
| Subject | linux-next: manual merge of the xfs tree with the ext4 tree |
| Message-ID | <raW1B-716-41@gated-at.bofh.it> |
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
*/
[toc] | [next] | [standalone]
| From | Jan Kara <jack@suse.cz> |
|---|---|
| Date | 2016-03-10 10:20 +0100 |
| Message-ID | <rb4Vc-4Jq-7@gated-at.bofh.it> |
| In reply to | #1354668 |
On Thu 10-03-16 10:41:00, Stephen Rothwell wrote:
> 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).
Thanks! This merge looks correct as well.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web