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 6/8] ext4: move inode extension checks out from ext4_iomap_alloc()
Date: Thu, 3 Oct 2019 21:34:36 +1000 [thread overview]
Message-ID: <d1ca9cc472175760ef629fb66a88f0c9b0625052.1570100361.git.mbobrowski@mbobrowski.org> (raw)
In-Reply-To: <cover.1570100361.git.mbobrowski@mbobrowski.org>
We lift the inode extension/orphan list handling logic out from
ext4_iomap_alloc() and place it within the caller
ext4_dax_write_iter().
Signed-off-by: Matthew Bobrowski <mbobrowski@mbobrowski.org>
---
fs/ext4/file.c | 17 +++++++++++++++++
fs/ext4/inode.c | 22 ----------------------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 2883711e8a33..f64da0c590b2 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -309,6 +309,7 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)
ssize_t ret;
size_t count;
loff_t offset;
+ handle_t *handle;
struct inode *inode = file_inode(iocb->ki_filp);
if (!inode_trylock(inode)) {
@@ -328,6 +329,22 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)
offset = iocb->ki_pos;
count = iov_iter_count(from);
+
+ if (offset + count > EXT4_I(inode)->i_disksize) {
+ handle = ext4_journal_start(inode, EXT4_HT_INODE, 2);
+ if (IS_ERR(handle)) {
+ ret = PTR_ERR(handle);
+ goto out;
+ }
+
+ ret = ext4_orphan_add(handle, inode);
+ if (ret) {
+ ext4_journal_stop(handle);
+ goto out;
+ }
+ ext4_journal_stop(handle);
+ }
+
ret = dax_iomap_rw(iocb, from, &ext4_iomap_ops);
error = ext4_handle_inode_extension(inode, offset, ret, count);
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index d616062b603e..e133dda55063 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3508,7 +3508,6 @@ static int ext4_iomap_alloc(struct inode *inode,
struct ext4_map_blocks *map)
{
handle_t *handle;
- u8 blkbits = inode->i_blkbits;
int ret, dio_credits, retries = 0;
/*
@@ -3530,28 +3529,7 @@ static int ext4_iomap_alloc(struct inode *inode,
return PTR_ERR(handle);
ret = ext4_map_blocks(handle, inode, map, EXT4_GET_BLOCKS_CREATE_ZERO);
- if (ret < 0)
- goto journal_stop;
- /*
- * If we have allocated blocks beyond the EOF, we need to make
- * sure that they get truncate if we crash before updating the
- * inode size metadata in ext4_iomap_end(). For faults, we
- * don't need to do that (and cannot due to the orphan list
- * operations needing an inode_lock()). If we happen to
- * instantiate blocks beyond EOF, it is because we race with a
- * truncate operation, which already has added the inode onto
- * the orphan list.
- */
- if (!(flags & IOMAP_FAULT) && first_block + map->m_len >
- (i_size_read(inode) + (1 << blkbits) - 1) >> blkbits) {
- int err;
-
- err = ext4_orphan_add(handle, inode);
- if (err < 0)
- ret = err;
- }
-journal_stop:
ext4_journal_stop(handle);
if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
goto retry;
--
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 ` Matthew Bobrowski [this message]
2019-10-08 11:27 ` [PATCH v4 6/8] ext4: move inode extension checks out from ext4_iomap_alloc() 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 ` [PATCH v4 7/8] ext4: reorder map.m_flags checks in ext4_set_iomap() Matthew Bobrowski
2019-10-08 11:30 ` 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=d1ca9cc472175760ef629fb66a88f0c9b0625052.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).