All of lore.kernel.org
 help / color / mirror / Atom feed
From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: Eric Sandeen <sandeen@redhat.com>
Subject: [PATCH 01/28] ext4: fix async i/o writes beyond 4GB to a sparse file
Date: Tue,  2 Mar 2010 13:18:18 -0500	[thread overview]
Message-ID: <1267553925-6308-2-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1267553925-6308-1-git-send-email-tytso@mit.edu>

From: Eric Sandeen <sandeen@redhat.com>

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>
---
 fs/ext4/ext4.h    |    6 +++---
 fs/ext4/extents.c |    2 +-
 fs/ext4/inode.c   |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 874d169..602d5ad 100644
--- 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 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);
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 765a482..c568779 100644
--- 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;
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index e119524..2059c34 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,"
-- 
1.6.6.1.1.g974db.dirty


  reply	other threads:[~2010-03-02 18:18 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-02 18:18 [PATCH 00/28] Ext4 patch queue for the 2.6.34 merge window Theodore Ts'o
2010-03-02 18:18 ` Theodore Ts'o [this message]
2010-03-02 18:18 ` [PATCH 02/28] ext4: Fix optional-arg mount options Theodore Ts'o
2010-03-02 18:18 ` [PATCH 03/28] ext4: Add block validity check when truncating indirect block mapped inodes Theodore Ts'o
2010-03-02 18:18 ` [PATCH 04/28] ext4: Add new tracepoint for jbd2_cleanup_journal_tail Theodore Ts'o
2010-03-02 18:18 ` [PATCH 05/28] ext4: Add new tracepoints to debug delayed allocation space functions Theodore Ts'o
2010-03-02 18:18 ` [PATCH 06/28] ext4: Use slab allocator for sub-page sized allocations Theodore Ts'o
2010-03-02 18:18 ` [PATCH 07/28] ext4: Use bitops to read/modify EXT4_I(inode)->i_state Theodore Ts'o
2010-03-02 18:18 ` [PATCH 08/28] ext4: Reserve INCOMPAT_EA_INODE and INCOMPAT_DIRDATA feature codepoints Theodore Ts'o
2010-03-02 18:18 ` [PATCH 09/28] ext4: move __func__ into a macro for ext4_warning, ext4_error Theodore Ts'o
2010-03-02 18:18 ` [PATCH 10/28] ext4: add missing error checking to ext4_expand_extra_isize_ea() Theodore Ts'o
2010-03-02 18:18 ` [PATCH 11/28] ext4: correctly calculate number of blocks for fiemap Theodore Ts'o
2010-03-03  7:47   ` Akira Fujita
2010-03-03  8:34     ` Leonard Michlmayr
2010-03-03 17:52     ` tytso
2010-03-04  5:40       ` Akira Fujita
2010-03-04 21:44         ` Leonard Michlmayr
2010-03-04 22:28           ` [incomplete PATCH] ext4: avoid overflow in fiemap Leonard Michlmayr
2010-03-07  3:38             ` tytso
2010-03-04 23:38           ` [PATCH 11/28] ext4: correctly calculate number of blocks for fiemap Eric Sandeen
2010-03-05 16:46             ` Leonard Michlmayr
2010-03-04 22:08         ` tytso
2010-03-04 23:47           ` Eric Sandeen
2010-03-02 18:18 ` [PATCH 12/28] jbd2: delay discarding buffers in journal_unmap_buffer Theodore Ts'o
2010-03-02 18:18 ` [PATCH 13/28] ext4: Fix BUG_ON at fs/buffer.c:652 in no journal mode Theodore Ts'o
2010-03-02 18:18 ` [PATCH 14/28] ext4: Add flag to files with blocks intentionally past EOF Theodore Ts'o
2010-03-02 18:18 ` [PATCH 15/28] ext4: mount flags manipulation cleanup Theodore Ts'o
2010-03-02 18:18 ` [PATCH 16/28] ext4: trivial quota cleanup Theodore Ts'o
2010-03-02 18:18 ` [PATCH 17/28] jbd2: clean up an assertion in jbd2_journal_commit_transaction() Theodore Ts'o
2010-03-02 18:18 ` [PATCH 18/28] ext4: Fix fencepost error in chosing choosing group vs file preallocation Theodore Ts'o
2010-03-02 18:18 ` [PATCH 19/28] ext4: deprecate obsoleted mount options Theodore Ts'o
2010-03-02 18:18 ` [PATCH 20/28] ext4: fix error handling in migrate Theodore Ts'o
2010-03-02 18:18 ` [PATCH 21/28] ext4: explicitly remove inode from orphan list after failed direct io Theodore Ts'o
2010-03-02 18:18 ` [PATCH 22/28] ext4: Handle non empty on-disk orphan link Theodore Ts'o
2010-03-02 18:18 ` [PATCH 23/28] ext4: make "offset" consistent in ext4_check_dir_entry() Theodore Ts'o
2010-03-02 18:18 ` [PATCH 24/28] ext4: mechanical change on dio get_block code in prepare for it to be used by buffer write Theodore Ts'o
2010-03-02 18:18 ` [PATCH 25/28] ext4: use ext4_get_block_write in " Theodore Ts'o
2010-03-02 18:18 ` [PATCH 26/28] ext4: Use direct_IO_no_locking in ext4 dio read Theodore Ts'o
2010-03-02 18:18 ` [PATCH 27/28] ext4: Convert BUG_ON checks to use ext4_error() instead Theodore Ts'o
2010-03-06 13:03   ` Aneesh Kumar K. V
2010-03-07  2:45     ` tytso
2010-03-07  5:51       ` Eric Sandeen
2010-03-07 17:36         ` Andreas Dilger
2010-03-08 17:46       ` Frank Mayhar
2010-03-02 18:18 ` [PATCH 28/28] ext4: Fix ext4_quota_write cross block boundary behaviour Theodore Ts'o
2010-03-02 18:26 ` [PATCH 00/28] Ext4 patch queue for the 2.6.34 merge window tytso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1267553925-6308-2-git-send-email-tytso@mit.edu \
    --to=tytso@mit.edu \
    --cc=linux-ext4@vger.kernel.org \
    --cc=sandeen@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.