Unverified Commit 11596dc3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian Brauner
Browse files

iomap: pass flags to iomap_file_buffered_write_punch_delalloc 



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: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240910043949.3481298-4-hch@lst.de


Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent b53fdb21

fs/iomap/buffered-io.c

+5 −6
Original line number Diff line number Diff line
@@ -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.
@@ -1200,8 +1199,8 @@ static int iomap_write_delalloc_scan(struct inode *inode, 
 * require sprinkling this code with magic "+ 1" and "- 1" arithmetic and expose

 * the code to subtle off-by-one bugs....

 */

static int iomap_write_delalloc_release(struct inode *inode,

		loff_t start_byte, loff_t end_byte, iomap_punch_t punch)

static int iomap_write_delalloc_release(struct inode *inode, loff_t start_byte,

		loff_t end_byte, unsigned flags, iomap_punch_t punch)

{

	loff_t punch_start_byte = start_byte;

	loff_t scan_end_byte = min(i_size_read(inode), end_byte);
@@ -1301,8 +1300,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;
@@ -1330,7 +1329,7 @@ int iomap_file_buffered_write_punch_delalloc(struct inode *inode, 
	if (start_byte >= end_byte)

		return 0;



	return iomap_write_delalloc_release(inode, start_byte, end_byte,

	return iomap_write_delalloc_release(inode, start_byte, end_byte, flags,

					punch);

}

EXPORT_SYMBOL_GPL(iomap_file_buffered_write_punch_delalloc);

fs/xfs/xfs_iomap.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/iomap.h

+6 −4
Original line number Diff line number Diff line
@@ -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, void *private);

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,