From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Chinner <david@fromorbit.com>, xfs@oss.sgi.com
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jan Kara <jack@suse.cz>
Subject: linux-next: manual merge of the xfs tree with the ext4 tree
Date: Thu, 10 Mar 2016 10:41:00 +1100 [thread overview]
Message-ID: <20160310104100.6f906679@canb.auug.org.au> (raw)
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
*/
next reply other threads:[~2016-03-09 23:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 23:41 Stephen Rothwell [this message]
2016-03-10 9:19 ` linux-next: manual merge of the xfs tree with the ext4 tree Jan Kara
-- strict thread matches above, loose matches on Subject: below --
2016-03-09 23:40 Stephen Rothwell
2016-03-10 9:18 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160310104100.6f906679@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=david@fromorbit.com \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).