[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ejn2uuiwgbxnfzzza4bm4xjpxdkwgjtbu6spbi5njdwy4mwa73@jaxlr2a57o7o>
Date: Fri, 19 Dec 2025 17:40:23 +0100
From: Jan Kara <jack@...e.cz>
To: Zhang Yi <yi.zhang@...weicloud.com>
Cc: linux-ext4@...r.kernel.org, linux-fsdevel@...r.kernel.org,
linux-kernel@...r.kernel.org, tytso@....edu, adilger.kernel@...ger.ca, jack@...e.cz,
ojaswin@...ux.ibm.com, ritesh.list@...il.com, yi.zhang@...wei.com, yizhang089@...il.com,
libaokun1@...wei.com, yangerkun@...wei.com, yukuai@...as.com
Subject: Re: [PATCH -next 4/7] ext4: remove useless ext4_iomap_overwrite_ops
On Sat 13-12-25 10:20:05, Zhang Yi wrote:
> From: Zhang Yi <yi.zhang@...wei.com>
>
> ext4_iomap_overwrite_ops was introduced in commit 8cd115bdda17 ("ext4:
> Optimize ext4 DIO overwrites"), which can optimize pure overwrite
> performance by dropping the IOMAP_WRITE flag to only query the mapped
> mapping information. This avoids starting a new journal handle, thereby
> improving speed. Later, commit 9faac62d4013 ("ext4: optimize file
> overwrites") also optimized similar scenarios, but it performs the check
> later, examining the mappings status only when the actual block mapping
> is needed. Thus, it can handle the previous commit scenario. That means
> in the case of an overwrite scenario, the condition
> "offset + length <= i_size_read(inode)" in the write path must always be
> true.
>
> Therefore, it is acceptable to remove the ext4_iomap_overwrite_ops,
> which will also clarify the write and read paths of ext4_iomap_begin.
>
> Signed-off-by: Zhang Yi <yi.zhang@...wei.com>
Nice simplification! Feel free to add:
Reviewed-by: Jan Kara <jack@...e.cz>
Honza
> ---
> fs/ext4/ext4.h | 1 -
> fs/ext4/file.c | 5 +----
> fs/ext4/inode.c | 24 ------------------------
> 3 files changed, 1 insertion(+), 29 deletions(-)
>
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 56112f201cac..9a71357f192d 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -3909,7 +3909,6 @@ static inline void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end)
> }
>
> extern const struct iomap_ops ext4_iomap_ops;
> -extern const struct iomap_ops ext4_iomap_overwrite_ops;
> extern const struct iomap_ops ext4_iomap_report_ops;
>
> static inline int ext4_buffer_uptodate(struct buffer_head *bh)
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c
> index 9f571acc7782..6b4b68f830d5 100644
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@ -506,7 +506,6 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)
> struct inode *inode = file_inode(iocb->ki_filp);
> loff_t offset = iocb->ki_pos;
> size_t count = iov_iter_count(from);
> - const struct iomap_ops *iomap_ops = &ext4_iomap_ops;
> bool extend = false, unwritten = false;
> bool ilock_shared = true;
> int dio_flags = 0;
> @@ -573,9 +572,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)
> goto out;
> }
>
> - if (ilock_shared && !unwritten)
> - iomap_ops = &ext4_iomap_overwrite_ops;
> - ret = iomap_dio_rw(iocb, from, iomap_ops, &ext4_dio_write_ops,
> + ret = iomap_dio_rw(iocb, from, &ext4_iomap_ops, &ext4_dio_write_ops,
> dio_flags, NULL, 0);
> if (ret == -ENOTBLK)
> ret = 0;
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 08a296122fe0..88144e2ce3e2 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -3830,10 +3830,6 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
> }
> ret = ext4_iomap_alloc(inode, &map, flags);
> } else {
> - /*
> - * This can be called for overwrites path from
> - * ext4_iomap_overwrite_begin().
> - */
> ret = ext4_map_blocks(NULL, inode, &map, 0);
> }
>
> @@ -3862,30 +3858,10 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
> return 0;
> }
>
> -static int ext4_iomap_overwrite_begin(struct inode *inode, loff_t offset,
> - loff_t length, unsigned flags, struct iomap *iomap,
> - struct iomap *srcmap)
> -{
> - int ret;
> -
> - /*
> - * Even for writes we don't need to allocate blocks, so just pretend
> - * we are reading to save overhead of starting a transaction.
> - */
> - flags &= ~IOMAP_WRITE;
> - ret = ext4_iomap_begin(inode, offset, length, flags, iomap, srcmap);
> - WARN_ON_ONCE(!ret && iomap->type != IOMAP_MAPPED);
> - return ret;
> -}
> -
> const struct iomap_ops ext4_iomap_ops = {
> .iomap_begin = ext4_iomap_begin,
> };
>
> -const struct iomap_ops ext4_iomap_overwrite_ops = {
> - .iomap_begin = ext4_iomap_overwrite_begin,
> -};
> -
> static int ext4_iomap_begin_report(struct inode *inode, loff_t offset,
> loff_t length, unsigned int flags,
> struct iomap *iomap, struct iomap *srcmap)
> --
> 2.46.1
>
--
Jan Kara <jack@...e.com>
SUSE Labs, CR
Powered by blists - more mailing lists