Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1de02dc authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

ext4: fix async i/o writes beyond 4GB to a sparse file 



The "offset" member in ext4_io_end holds bytes, not blocks, so
ext4_lblk_t is wrong - and too small (u32).

This caused the async i/o writes to sparse files beyond 4GB to fail
when they wrapped around to 0.

Also fix up the type of arguments to ext4_convert_unwritten_extents(),
it gets ssize_t from ext4_end_aio_dio_nolock() and
ext4_ext_direct_IO().

Reported-by: default avatarGiel de Nijs <giel@vectorwise.com>
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
parent 724e6d3f

fs/ext4/ext4.h

+3 −3
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ typedef struct ext4_io_end { 
	struct inode		*inode;		/* file being written to */

	unsigned int		flag;		/* unwritten or not */

	int			error;		/* I/O error code */

	ext4_lblk_t		offset;		/* offset in the file */

	size_t			size;		/* size of the extent */

	loff_t			offset;		/* offset in the file */

	ssize_t			size;		/* size of the extent */

	struct work_struct	work;		/* data work queue */

} ext4_io_end_t;
@@ -1744,7 +1744,7 @@ extern void ext4_ext_release(struct super_block *); 
extern long ext4_fallocate(struct inode *inode, int mode, loff_t offset,

			  loff_t len);

extern int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset,

			  loff_t len);

			  ssize_t len);

extern int ext4_get_blocks(handle_t *handle, struct inode *inode,

			   sector_t block, unsigned int max_blocks,

			   struct buffer_head *bh, int flags);

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -3603,7 +3603,7 @@ retry: 
 * Returns 0 on success.

 */

int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset,

				    loff_t len)

				    ssize_t len)

{

	handle_t *handle;

	ext4_lblk_t block;

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3551,7 +3551,7 @@ static int ext4_end_aio_dio_nolock(ext4_io_end_t *io) 
{

	struct inode *inode = io->inode;

	loff_t offset = io->offset;

	size_t size = io->size;

	ssize_t size = io->size;

	int ret = 0;



	ext4_debug("end_aio_dio_onlock: io 0x%p from inode %lu,list->next 0x%p,"