summaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2010-02-04 23:58:38 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-26 07:48:04 -0700
commit4c08f09270bdf83ca42a058970613cabe3fc8b41 (patch)
tree1e82f713ce8501bdca352693bdb793e3810a6424 /fs/ext4/inode.c
parentc081243f7a9278f093bbc87bc5c56f1f2d203904 (diff)
downloadkernel-crypto-4c08f09270bdf83ca42a058970613cabe3fc8b41.tar.gz
kernel-crypto-4c08f09270bdf83ca42a058970613cabe3fc8b41.tar.xz
kernel-crypto-4c08f09270bdf83ca42a058970613cabe3fc8b41.zip
ext4: fix async i/o writes beyond 4GB to a sparse file
commit a1de02dccf906faba2ee2d99cac56799bda3b96a upstream. 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: Giel de Nijs <giel@vectorwise.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Cc: maximilian attems <max@stro.at> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index e11952404e0..2059c34ac4c 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -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,"