.33 patch

diff --git a/queue-2.6.33/ext4-fix-async-i-o-writes-beyond-4gb-to-a-sparse-file.patch b/queue-2.6.33/ext4-fix-async-i-o-writes-beyond-4gb-to-a-sparse-file.patch
new file mode 100644 (file)
index 0000000..2daf8d2
--- /dev/null
+++ b/queue-2.6.33/ext4-fix-async-i-o-writes-beyond-4gb-to-a-sparse-file.patch
@@ -0,0 +1,74 @@
+From a1de02dccf906faba2ee2d99cac56799bda3b96a Mon Sep 17 00:00:00 2001
+From: Eric Sandeen <sandeen@redhat.com>
+Date: Thu, 4 Feb 2010 23:58:38 -0500
+Subject: ext4: fix async i/o writes beyond 4GB to a sparse file
+
+From: Eric Sandeen <sandeen@redhat.com>
+
+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>
+
+---
+ fs/ext4/ext4.h    |    6 +++---
+ fs/ext4/extents.c |    2 +-
+ fs/ext4/inode.c   |    2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/fs/ext4/ext4.h
++++ b/fs/ext4/ext4.h
+@@ -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 supe
+ 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);
+--- a/fs/ext4/extents.c
++++ b/fs/ext4/extents.c
+@@ -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;
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -3551,7 +3551,7 @@ static int ext4_end_aio_dio_nolock(ext4_
+ {
+       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,"

diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index ddbe912fd706feb09f79cd57dfdd7641febdcab7..5fbb49d04e8623560891270f17bc8bf6e7bd4b2e 100644 (file)
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -124,4 +124,5 @@ lockdep-fix-incorrect-percpu-usage.patch
 module-fix-__module_ref_addr.patch
 md-deal-with-merge_bvec_fn-in-component-devices-better.patch
 powerpc-fix-smp-build-with-disabled-cpu-hotplugging.patch
+ext4-fix-async-i-o-writes-beyond-4gb-to-a-sparse-file.patch
 nfsd4-don-t-try-to-map-gid-s-in-generic-rpc-code.patch