From: Matthew Bobrowski <mbobrowski@mbobrowski.org>
To: tytso@mit.edu, jack@suse.cz, adilger.kernel@dilger.ca
Cc: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org,
hch@infradead.org, david@fromorbit.com, darrick.wong@oracle.com
Subject: [PATCH v4 7/8] ext4: reorder map.m_flags checks in ext4_set_iomap()
Date: Thu, 3 Oct 2019 21:34:51 +1000 [thread overview]
Message-ID: <3551610e53aa1984210a4de04ad6e1a89f5bf0a3.1570100361.git.mbobrowski@mbobrowski.org> (raw)
In-Reply-To: <cover.1570100361.git.mbobrowski@mbobrowski.org>
For iomap direct IO write code path changes, we need to accommodate
for the case where the block mapping flags passed to ext4_map_blocks()
will result in m_flags having both EXT4_MAP_MAPPED and
EXT4_MAP_UNWRITTEN bits set. In order for the allocated unwritten
extents to be converted properly in the end_io handler, iomap->type
must be set to IOMAP_UNWRITTEN, so we need to reshuffle the
conditional statement in order to achieve this.
This change is a no-op for DAX code path as the block mapping flag
passed to ext4_map_blocks() when IS_DAX(inode) never results in
EXT4_MAP_MAPPED and EXT4_MAP_UNWRITTEN being set at once.
Signed-off-by: Matthew Bobrowski <mbobrowski@mbobrowski.org>
---
fs/ext4/inode.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index e133dda55063..63ad23ae05b8 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3420,10 +3420,20 @@ static int ext4_set_iomap(struct inode *inode, struct iomap *iomap, u16 type,
iomap->type = type;
iomap->addr = IOMAP_NULL_ADDR;
} else {
- if (map->m_flags & EXT4_MAP_MAPPED) {
- iomap->type = IOMAP_MAPPED;
- } else if (map->m_flags & EXT4_MAP_UNWRITTEN) {
+ /*
+ * Flags passed to ext4_map_blocks() for direct I/O
+ * writes can result in map->m_flags having both
+ * EXT4_MAP_MAPPED and EXT4_MAP_UNWRITTEN bits set. In
+ * order for allocated extents to be converted to
+ * written extents in the ->end_io handler correctly,
+ * we need to ensure that the iomap->type is set
+ * approprately. Thus, we need to check whether
+ * EXT4_MAP_UNWRITTEN is set first.
+ */
+ if (map->m_flags & EXT4_MAP_UNWRITTEN) {
iomap->type = IOMAP_UNWRITTEN;
+ } else if (map->m_flags & EXT4_MAP_MAPPED) {
+ iomap->type = IOMAP_MAPPED;
} else {
WARN_ON_ONCE(1);
return -EIO;
--
2.20.1
next prev parent reply other threads:[~2019-10-03 11:34 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 11:32 [PATCH v4 0/8] ext4: port direct I/O to iomap infrastructure Matthew Bobrowski
2019-10-03 11:33 ` [PATCH v4 1/8] ext4: move out iomap field population into separate helper Matthew Bobrowski
2019-10-08 10:27 ` Jan Kara
2019-10-09 8:57 ` Matthew Bobrowski
2019-10-09 13:06 ` Jan Kara
2019-10-10 5:39 ` Matthew Bobrowski
2019-10-09 6:02 ` Ritesh Harjani
2019-10-09 7:07 ` Christoph Hellwig
2019-10-09 7:50 ` Ritesh Harjani
2019-10-09 9:09 ` Matthew Bobrowski
2019-10-03 11:33 ` [PATCH v4 2/8] ext4: move out IOMAP_WRITE path " Matthew Bobrowski
2019-10-08 10:31 ` Jan Kara
2019-10-09 9:18 ` Matthew Bobrowski
2019-10-09 6:22 ` Ritesh Harjani
2019-10-09 9:31 ` Matthew Bobrowski
2019-10-03 11:33 ` [PATCH v4 3/8] ext4: introduce new callback for IOMAP_REPORT operations Matthew Bobrowski
2019-10-08 10:42 ` Jan Kara
2019-10-09 9:41 ` Matthew Bobrowski
2019-10-09 6:00 ` Ritesh Harjani
2019-10-09 12:08 ` Matthew Bobrowski
2019-10-09 13:14 ` Ritesh Harjani
2019-10-03 11:34 ` [PATCH v4 4/8] ext4: introduce direct I/O read path using iomap infrastructure Matthew Bobrowski
2019-10-08 10:52 ` Jan Kara
2019-10-09 10:55 ` Matthew Bobrowski
2019-10-09 6:39 ` Ritesh Harjani
2019-10-03 11:34 ` [PATCH v4 5/8] ext4: move inode extension/truncate code out from ->iomap_end() callback Matthew Bobrowski
2019-10-08 11:25 ` Jan Kara
2019-10-09 10:18 ` Matthew Bobrowski
2019-10-09 12:51 ` Jan Kara
2019-10-10 5:44 ` Matthew Bobrowski
2019-10-09 6:27 ` Ritesh Harjani
2019-10-09 10:20 ` Matthew Bobrowski
2019-10-03 11:34 ` [PATCH v4 6/8] ext4: move inode extension checks out from ext4_iomap_alloc() Matthew Bobrowski
2019-10-08 11:27 ` Jan Kara
2019-10-09 10:21 ` Matthew Bobrowski
2019-10-09 6:30 ` Ritesh Harjani
2019-10-09 10:39 ` Matthew Bobrowski
2019-10-03 11:34 ` Matthew Bobrowski [this message]
2019-10-08 11:30 ` [PATCH v4 7/8] ext4: reorder map.m_flags checks in ext4_set_iomap() Jan Kara
2019-10-09 10:42 ` Matthew Bobrowski
2019-10-09 6:35 ` Ritesh Harjani
2019-10-09 10:43 ` Matthew Bobrowski
2019-10-03 11:35 ` [PATCH v4 8/8] ext4: introduce direct I/O write path using iomap infrastructure Matthew Bobrowski
2019-10-08 15:12 ` Jan Kara
2019-10-09 7:11 ` Christoph Hellwig
2019-10-09 13:41 ` Jan Kara
2019-10-09 11:53 ` Matthew Bobrowski
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=3551610e53aa1984210a4de04ad6e1a89f5bf0a3.1570100361.git.mbobrowski@mbobrowski.org \
--to=mbobrowski@mbobrowski.org \
--cc=adilger.kernel@dilger.ca \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
/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).