diff options
author | Eric Sandeen <sandeen@redhat.com> | 2010-02-04 23:58:38 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-02-04 23:58:38 -0500 |
commit | a1de02dccf906faba2ee2d99cac56799bda3b96a (patch) | |
tree | 9871a11252e9a7d39882206c2057ec3080517365 /fs/ext4/ext4.h | |
parent | 724e6d3fe8003c3f60bf404bf22e4e331327c596 (diff) |
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: Giel de Nijs <giel@vectorwise.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Diffstat (limited to 'fs/ext4/ext4.h')
-rw-r--r-- | fs/ext4/ext4.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 874d169a193e..602d5ad6f5e7 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -139,8 +139,8 @@ typedef struct ext4_io_end { | |||
139 | struct inode *inode; /* file being written to */ | 139 | struct inode *inode; /* file being written to */ |
140 | unsigned int flag; /* unwritten or not */ | 140 | unsigned int flag; /* unwritten or not */ |
141 | int error; /* I/O error code */ | 141 | int error; /* I/O error code */ |
142 | ext4_lblk_t offset; /* offset in the file */ | 142 | loff_t offset; /* offset in the file */ |
143 | size_t size; /* size of the extent */ | 143 | ssize_t size; /* size of the extent */ |
144 | struct work_struct work; /* data work queue */ | 144 | struct work_struct work; /* data work queue */ |
145 | } ext4_io_end_t; | 145 | } ext4_io_end_t; |
146 | 146 | ||
@@ -1744,7 +1744,7 @@ extern void ext4_ext_release(struct super_block *); | |||
1744 | extern long ext4_fallocate(struct inode *inode, int mode, loff_t offset, | 1744 | extern long ext4_fallocate(struct inode *inode, int mode, loff_t offset, |
1745 | loff_t len); | 1745 | loff_t len); |
1746 | extern int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset, | 1746 | extern int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset, |
1747 | loff_t len); | 1747 | ssize_t len); |
1748 | extern int ext4_get_blocks(handle_t *handle, struct inode *inode, | 1748 | extern int ext4_get_blocks(handle_t *handle, struct inode *inode, |
1749 | sector_t block, unsigned int max_blocks, | 1749 | sector_t block, unsigned int max_blocks, |
1750 | struct buffer_head *bh, int flags); | 1750 | struct buffer_head *bh, int flags); |