On Tue, Aug 27, 2024 at 07:09:50AM +0200, Christoph Hellwig wrote:
> To fix short write error handling, We'll need to figure out what operation
> iomap_file_buffered_write_punch_delalloc is called for. Pass the flags
> argument on to it, and reorder the argument list to match that of
> ->iomap_end so that the compiler only has to add the new punch argument
> to the end of it instead of reshuffling the registers.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks good,
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/iomap/buffered-io.c | 5 ++---
> fs/xfs/xfs_iomap.c | 5 +++--
> include/linux/iomap.h | 10 ++++++----
> 3 files changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index 737a005082e035..34de9f58794ad5 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -23,7 +23,6 @@
>
> #define IOEND_BATCH_SIZE 4096
>
> -typedef int (*iomap_punch_t)(struct inode *inode, loff_t offset, loff_t length);
> /*
> * Structure allocated for each folio to track per-block uptodate, dirty state
> * and I/O completions.
> @@ -1300,8 +1299,8 @@ static int iomap_write_delalloc_release(struct inode *inode,
> * internal filesystem allocation lock
> */
> int iomap_file_buffered_write_punch_delalloc(struct inode *inode,
> - struct iomap *iomap, loff_t pos, loff_t length,
> - ssize_t written, iomap_punch_t punch)
> + loff_t pos, loff_t length, ssize_t written, unsigned flags,
> + struct iomap *iomap, iomap_punch_t punch)
> {
> loff_t start_byte;
> loff_t end_byte;
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 72c981e3dc9211..47b5c83588259e 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -1231,8 +1231,9 @@ xfs_buffered_write_iomap_end(
> struct xfs_mount *mp = XFS_M(inode->i_sb);
> int error;
>
> - error = iomap_file_buffered_write_punch_delalloc(inode, iomap, offset,
> - length, written, &xfs_buffered_write_delalloc_punch);
> + error = iomap_file_buffered_write_punch_delalloc(inode, offset, length,
> + written, flags, iomap,
> + &xfs_buffered_write_delalloc_punch);
> if (error && !xfs_is_shutdown(mp)) {
> xfs_alert(mp, "%s: unable to clean up ino 0x%llx",
> __func__, XFS_I(inode)->i_ino);
> diff --git a/include/linux/iomap.h b/include/linux/iomap.h
> index 6fc1c858013d1e..83da37d64d1144 100644
> --- a/include/linux/iomap.h
> +++ b/include/linux/iomap.h
> @@ -258,10 +258,6 @@ static inline const struct iomap *iomap_iter_srcmap(const struct iomap_iter *i)
>
> ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from,
> const struct iomap_ops *ops);
> -int iomap_file_buffered_write_punch_delalloc(struct inode *inode,
> - struct iomap *iomap, loff_t pos, loff_t length, ssize_t written,
> - int (*punch)(struct inode *inode, loff_t pos, loff_t length));
> -
> int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops);
> void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops);
> bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count);
> @@ -277,6 +273,12 @@ int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
> const struct iomap_ops *ops);
> vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf,
> const struct iomap_ops *ops);
> +
> +typedef int (*iomap_punch_t)(struct inode *inode, loff_t offset, loff_t length);
> +int iomap_file_buffered_write_punch_delalloc(struct inode *inode, loff_t pos,
> + loff_t length, ssize_t written, unsigned flag,
> + struct iomap *iomap, iomap_punch_t punch);
> +
> int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> u64 start, u64 len, const struct iomap_ops *ops);
> loff_t iomap_seek_hole(struct inode *inode, loff_t offset,
> --
> 2.43.0
>
>
